adjust default defines, compile fix

3 files changed, 25 insertions, 12 deletions

diff --git a/Android.mk b/Android.mk
index 4075dc9..3427e4e 100644
--- a/Android.mk
+++ b/Android.mk
@@ -61,7 +61,8 @@ LOCAL_STATIC_LIBRARIES := libsimd
  
 LOCAL_C_INCLUDES := $(LOCAL_PATH) 
  
-LOCAL_CFLAGS := -DAVOID_TABLES  -O3 -fstrict-aliasing -fprefetch-loop-arrays  -DANDROID
+LOCAL_CFLAGS := -DAVOID_TABLES  -O3 -fstrict-aliasing -fprefetch-loop-arrays  -DANDROID \
+        -DANDROID_TILE_BASED_DECODE -DANDROID_RGB -DENABLE_ANDROID_NULL_CONVERT
 
 #-DANDROID_TILE_BASED_DECODE -DUSE_ANDROID_ASHMEM 
  
@@ -89,7 +90,8 @@ LOCAL_SHARED_LIBRARIES := libjpeg
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH) 
 
-LOCAL_CFLAGS := -DBMP_SUPPORTED -DGIF_SUPPORTED -DPPM_SUPPORTED -DTARGA_SUPPORTED 
+LOCAL_CFLAGS := -DBMP_SUPPORTED -DGIF_SUPPORTED -DPPM_SUPPORTED -DTARGA_SUPPORTED \
+         -DANDROID -DANDROID_TILE_BASED_DECODE -DANDROID_RGB -DENABLE_ANDROID_NULL_CONVERT
 
 LOCAL_MODULE_PATH := $(TARGET_OUT_OPTIONAL_EXECUTABLE)
 
@@ -115,7 +117,8 @@ LOCAL_SHARED_LIBRARIES := libjpeg
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH) 
 
-LOCAL_CFLAGS := -DBMP_SUPPORTED -DGIF_SUPPORTED -DPPM_SUPPORTED -DTARGA_SUPPORTED
+LOCAL_CFLAGS := -DBMP_SUPPORTED -DGIF_SUPPORTED -DPPM_SUPPORTED -DTARGA_SUPPORTED \
+            -DANDROID -DANDROID_TILE_BASED_DECODE -DANDROID_RGB -DENABLE_ANDROID_NULL_CONVERT
 
 LOCAL_MODULE_PATH := $(TARGET_OUT_OPTIONAL_EXECUTABLE)
 
@@ -140,7 +143,7 @@ LOCAL_SHARED_LIBRARIES := libjpeg
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH) 
 
-LOCAL_CFLAGS := 
+LOCAL_CFLAGS := -DANDROID -DANDROID_TILE_BASED_DECODE -DANDROID_RGB -DENABLE_ANDROID_NULL_CONVERT
 
 LOCAL_MODULE_PATH := $(TARGET_OUT_OPTIONAL_EXECUTABLE)
 
@@ -165,7 +168,7 @@ LOCAL_SHARED_LIBRARIES := libjpeg
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH) 
 
-LOCAL_CFLAGS := 
+LOCAL_CFLAGS := -DANDROID -DANDROID_TILE_BASED_DECODE -DANDROID_RGB -DENABLE_ANDROID_NULL_CONVERT
 
 LOCAL_MODULE_PATH := $(TARGET_OUT_OPTIONAL_EXECUTABLE)
 
@@ -191,7 +194,8 @@ LOCAL_SHARED_LIBRARIES := libjpeg
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH) 
 
-LOCAL_CFLAGS := -DBMP_SUPPORTED -DPPM_SUPPORTED
+LOCAL_CFLAGS := -DBMP_SUPPORTED -DPPM_SUPPORTED \
+         -DANDROID -DANDROID_TILE_BASED_DECODE -DANDROID_RGB -DENABLE_ANDROID_NULL_CONVERT
 
 LOCAL_MODULE_PATH := $(TARGET_OUT_OPTIONAL_EXECUTABLE)
 
@@ -216,7 +220,7 @@ LOCAL_SHARED_LIBRARIES := libjpeg
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH) 
 
-LOCAL_CFLAGS := 
+LOCAL_CFLAGS :=  -DANDROID -DANDROID_TILE_BASED_DECODE -DANDROID_RGB -DENABLE_ANDROID_NULL_CONVERT
 
 LOCAL_MODULE_PATH := $(TARGET_OUT_OPTIONAL_EXECUTABLE)
 
@@ -241,7 +245,7 @@ LOCAL_SHARED_LIBRARIES := libjpeg
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH) 
 
-LOCAL_CFLAGS := 
+LOCAL_CFLAGS := -DANDROID -DANDROID_TILE_BASED_DECODE -DANDROID_RGB -DENABLE_ANDROID_NULL_CONVERT
 
 LOCAL_MODULE_PATH := $(TARGET_OUT_OPTIONAL_EXECUTABLE)
 
diff --git a/jconfig.h b/jconfig.h
index e89b18b..3f12221 100644
--- a/jconfig.h
+++ b/jconfig.h
@@ -60,7 +60,3 @@
 /* Define to `unsigned int' if <sys/types.h> does not define. */
 /* #undef size_t */
 
-/* Android specific */
-#define ANDROID_RGB
-
-#define ENABLE_ANDROID_NULL_CONVERT
diff --git a/jdcoefct.c b/jdcoefct.c
index 7f80669..ccebf6b 100644
--- a/jdcoefct.c
+++ b/jdcoefct.c
@@ -25,6 +25,19 @@
 #undef BLOCK_SMOOTHING_SUPPORTED
 #endif
 
+#ifdef ANDROID
+METHODDEF(int)
+consume_data_multi_scan (j_decompress_ptr cinfo);
+
+METHODDEF(int)
+consume_data_build_huffman_index_baseline (j_decompress_ptr cinfo,
+        huffman_index *index, int current_scan);
+
+METHODDEF(int)
+consume_data_build_huffman_index_progressive (j_decompress_ptr cinfo,
+        huffman_index *index, int current_scan);
+#endif
+
 /* Private buffer controller object */
 
 typedef struct {