Separate core and images project.

src/image/SkImage.cpp

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
-#include "SkImage_Base.h"
-#include "SkImagePriv.h"
 #include "SkBitmap.h"
 #include "SkCanvas.h"
+#include "SkImageEncoder.h"
+#include "SkImagePriv.h"
+#include "SkImage_Base.h"
 
 SK_DEFINE_INST_COUNT(SkImage)
 
 static SkImage_Base* asIB(SkImage* image) {
     return static_cast<SkImage_Base*>(image);
 }
 

[robertphillips, 2013/05/28 23:22:56]

shouldn't this be as_IB and be in an anonymous namespace?

[scroggo, 2013/05/29 17:34:20]

I've changed asIB to as_IB. I don't see anything in the Skia guidelines about
using anonymous namespaces. Is that preferred?

+static const SkImage_Base* asIB(const SkImage* image) {
+    return static_cast<const SkImage_Base*>(image);
+}
+
 uint32_t SkImage::NextUniqueID() {
     static int32_t gUniqueID;
 
     // never return 0;
     uint32_t id;
     do {
         id = sk_atomic_inc(&gUniqueID) + 1;
     } while (0 == id);
     return id;
 }
 
 void SkImage::draw(SkCanvas* canvas, SkScalar x, SkScalar y,
                    const SkPaint* paint) {
     asIB(this)->onDraw(canvas, x, y, paint);
 }
 
 GrTexture* SkImage::getTexture() {
     return asIB(this)->onGetTexture();
 }
+
+static const struct {
+    SkImageEncoder::Type    fIE;
+    SkImage::EncodeType     fET;
+} gTable[] = {
+    { SkImageEncoder::kBMP_Type,    SkImage::kBMP_EncodeType  },
+    { SkImageEncoder::kGIF_Type,    SkImage::kGIF_EncodeType  },
+    { SkImageEncoder::kICO_Type,    SkImage::kICO_EncodeType  },
+    { SkImageEncoder::kJPEG_Type,   SkImage::kJPEG_EncodeType },
+    { SkImageEncoder::kPNG_Type,    SkImage::kPNG_EncodeType  },
+    { SkImageEncoder::kWBMP_Type,   SkImage::kWBMP_EncodeType },
+    { SkImageEncoder::kWEBP_Type,   SkImage::kWEBP_EncodeType },
+};
+

[robertphillips, 2013/05/28 23:22:56]

Since  SkImageEncoder::Type is an enum couldn't we have a numTypes value and
just change this into an array lookup rather than a search. In Ganesh we would
usually have asserts to ensure the order in the array and the size of the array
are correct.

[scroggo, 2013/05/29 17:34:20]

After looking at this some more, I don't think it makes sense to have a separate
enum. In order to build this piece of core, we need to include the header for
SkImageEncoder. Now we need to build SkImageDecoder_empty.cpp in order to build
core without building the images project, so I think it makes sense to include
SkImageDecoder.h and SkImageEncoder.h as part of core as well.

+SkData* SkImage::encode(EncodeType et, int quality) const {
+    for (size_t i = 0; i < SK_ARRAY_COUNT(gTable); ++i) {
+        if (gTable[i].fET == et) {
+            SkBitmap bm;
+            if (asIB(this)->getROPixels(&bm)) {
+                return SkImageEncoder::EncodeData(bm, gTable[i].fIE, quality);
+            }
+            break;
+        }
+    }
+    return NULL;
+}