fixed Image bit flags

src/Image.cc

@@ -107,9 +107,7 @@ Image::SetDataMode(Local<String>, Local<Value> val, const AccessorInfo &info) {
   if (val->IsNumber()) {
     Image *img = ObjectWrap::Unwrap<Image>(info.This());
     int mode = val->Uint32Value();
-    if (mode >= DATA_IMAGE && mode <= DATA_IMAGE_AND_MIME) {
+    img->data_mode = (data_mode_t) mode;
-      img->data_mode = (data_mode_t) mode;
-    }
   }
 }
 
@@ -219,16 +217,13 @@ Image::loadFromBuffer(uint8_t *buf, unsigned len) {
   if (isJPEG(buf)) return loadJPEGFromBuffer(buf, len);    
 #else
   if (isJPEG(buf)) {
-    switch (data_mode) {
+    if (DATA_IMAGE == data_mode) return loadJPEGFromBuffer(buf, len);
-      case DATA_IMAGE:
+    if (DATA_MIME == data_mode) return decodeJPEGBufferIntoMimeSurface(buf, len);
-        return loadJPEGFromBuffer(buf, len);
+    if ((DATA_IMAGE | DATA_MIME) == data_mode) {
-      case DATA_MIME:
+      cairo_status_t status;
-        return decodeJPEGBufferIntoMimeSurface(buf, len);
+      status = loadJPEGFromBuffer(buf, len);
-      case DATA_IMAGE_AND_MIME:
+      if (status) return status;
-        cairo_status_t status;
+      return assignDataAsMime(buf, len, CAIRO_MIME_TYPE_JPEG);
-        status = loadJPEGFromBuffer(buf, len);
-        if (status) return status;
-        return assignDataAsMime(buf, len, CAIRO_MIME_TYPE_JPEG);
     }
   }
 #endif
@@ -890,16 +885,11 @@ Image::loadJPEG(FILE *stream) {
     fread(buf, len, 1, stream);
     fclose(stream);
 
-    switch (data_mode) {
+    if ((DATA_IMAGE | DATA_MIME) == data_mode) {
-      case DATA_IMAGE: // Can't be this, but compiler warning.
+      status = loadJPEGFromBuffer(buf, len);
-      case DATA_IMAGE_AND_MIME:
+      if (!status) status = assignDataAsMime(buf, len, CAIRO_MIME_TYPE_JPEG);
-        status = loadJPEGFromBuffer(buf, len);
+    } else if (DATA_MIME == data_mode) {
-        if (status) break;
+      status = decodeJPEGBufferIntoMimeSurface(buf, len);
-        status = assignDataAsMime(buf, len, CAIRO_MIME_TYPE_JPEG);
-        break;
-      case DATA_MIME:
-        status = decodeJPEGBufferIntoMimeSurface(buf, len);
-        break;
     }
 
     free(buf);

src/Image.h

@@ -73,9 +73,8 @@ class Image: public node::ObjectWrap {
     } state;
 
     enum data_mode_t {
-        DATA_IMAGE
+        DATA_IMAGE = 1
-      , DATA_MIME
+      , DATA_MIME = 2
-      , DATA_IMAGE_AND_MIME
     } data_mode;
 
     typedef enum {