Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(91)

Unified Diff: ui/gfx/image/image_util.cc

Issue 10928093: Adds an iOS implementation of gfx::Image. (Closed) Base URL: http://git.chromium.org/chromium/src.git@skia
Patch Set: Moar GYP and TODOs. Created 8 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/gfx/image/image_util.h ('k') | ui/gfx/image/image_util_ios.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gfx/image/image_util.cc
diff --git a/ui/gfx/image/image_util.cc b/ui/gfx/image/image_util.cc
index 6403419ed4610cbf771e47ea4f5d25ede8648834..04bc5a284b26c31557e61b5c5bac1094e8630230 100644
--- a/ui/gfx/image/image_util.cc
+++ b/ui/gfx/image/image_util.cc
@@ -17,6 +17,14 @@ Image* ImageFromPNGEncodedData(const unsigned char* input, size_t input_size) {
return image;
}
+bool PNGEncodedDataFromImage(const Image& image,
+ std::vector<unsigned char>* dst) {
+ *dst = *image.ToImagePNG();
+ return !dst->empty();
+}
+
+// The iOS implementations of the JPEG functions are in image_util_ios.mm.
+#if !defined(OS_IOS)
Image ImageFromJPEGEncodedData(const unsigned char* input, size_t input_size) {
scoped_ptr<SkBitmap> bitmap(gfx::JPEGCodec::Decode(input, input_size));
if (bitmap.get())
@@ -25,12 +33,6 @@ Image ImageFromJPEGEncodedData(const unsigned char* input, size_t input_size) {
return Image();
}
-bool PNGEncodedDataFromImage(const Image& image,
- std::vector<unsigned char>* dst) {
- *dst = *image.ToImagePNG();
- return !dst->empty();
-}
-
bool JPEGEncodedDataFromImage(const Image& image, int quality,
std::vector<unsigned char>* dst) {
const SkBitmap& bitmap = *image.ToSkBitmap();
@@ -46,5 +48,6 @@ bool JPEGEncodedDataFromImage(const Image& image, int quality,
static_cast<int>(bitmap.rowBytes()), quality,
dst);
}
+#endif // !defined(OS_IOS)
}
« no previous file with comments | « ui/gfx/image/image_util.h ('k') | ui/gfx/image/image_util_ios.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698