From 9965e93f7eb7297490de597cc8ed8e18b4ba2872 Mon Sep 17 00:00:00 2001 From: "V.VamsiKrishna" Date: Fri, 20 Mar 2015 11:12:13 +0530 Subject: [PATCH] Revert "Removing etc1 from build for javascript platform." This reverts commit 41b729ccff74e5a9154bee7db0d36ffd74641eae. --- SConstruct | 1 - drivers/etc1/rg_etc1.cpp | 4 ++++ platform/javascript/detect.py | 1 - 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/SConstruct b/SConstruct index 42c803e81e0..cb32c0b5fff 100644 --- a/SConstruct +++ b/SConstruct @@ -111,7 +111,6 @@ opts.Add('jpg','JPG Image loader support (yes/no)','yes') opts.Add('webp','WEBP Image loader support (yes/no)','yes') opts.Add('dds','DDS Texture loader support (yes/no)','yes') opts.Add('pvr','PVR (PowerVR) Texture loader support (yes/no)','yes') -opts.Add('etc1','etc1 Texture compression support (yes/no)','yes') opts.Add('builtin_zlib','Use built-in zlib (yes/no)','yes') opts.Add('openssl','Use OpenSSL (yes/no/builtin)','no') opts.Add('musepack','Musepack Audio (yes/no)','yes') diff --git a/drivers/etc1/rg_etc1.cpp b/drivers/etc1/rg_etc1.cpp index d2959da386e..7eb1427d7a0 100644 --- a/drivers/etc1/rg_etc1.cpp +++ b/drivers/etc1/rg_etc1.cpp @@ -1918,7 +1918,11 @@ done: int v = etc1_decode_value(diff, inten, selector, packed_c); uint err = labs(v - static_cast(color)); //printf("err: %d - %u = %u\n",v,color,err); + #ifdef JAVASCRIPT_ENABLED + if (err < best_error || best_error == cUINT32_MAX) + #else if (err < best_error) + #endif { best_error = err; best_packed_c = packed_c; diff --git a/platform/javascript/detect.py b/platform/javascript/detect.py index 947a637fb99..3123367ff0e 100644 --- a/platform/javascript/detect.py +++ b/platform/javascript/detect.py @@ -36,7 +36,6 @@ def get_flags(): ('squish', 'no'), ('speex', 'no'), ('old_scenes', 'no'), - ('etc1', 'no'), # ('default_gui_theme', 'no'), #('builtin_zlib', 'no'),