[Gnash-commit] gnash libbase/tu_config.h libbase/jpeg.cpp serv...

[Martin Guy]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Martin Guy <martinwguy> 07/05/02 10:30:09

Modified files:
        libbase        : tu_config.h jpeg.cpp 
        server/swf     : tag_loaders.cpp 
        .              : compatibility_include.h ChangeLog 

Log message:
                * 
libbase/tu_config.h,libbase/jpeg.cpp,server/swf/tag_loaders.cpp,
                  compatibility_include.h: Having jpeglib is compulsory, so
                  remove TU_CONFIG_LINK_TO_JPEGLIB

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/tu_config.h?cvsroot=gnash&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/jpeg.cpp?cvsroot=gnash&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf/tag_loaders.cpp?cvsroot=gnash&r1=1.93&r2=1.94
http://cvs.savannah.gnu.org/viewcvs/gnash/compatibility_include.h?cvsroot=gnash&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3057&r2=1.3058

Patches:
Index: libbase/tu_config.h
===================================================================
RCS file: /sources/gnash/gnash/libbase/tu_config.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- libbase/tu_config.h 1 Dec 2006 10:22:12 -0000       1.12
+++ libbase/tu_config.h 2 May 2007 10:30:08 -0000       1.13
@@ -35,14 +35,6 @@
 #define tu_error_exit(error_code, error_message) { fprintf(stderr, 
error_message); std::exit(error_code); }
 #endif
 
-
-// define TU_CONFIG_LINK_TO_JPEGLIB to 0 to exclude jpeg code from
-// your build.  Be aware of what you're doing -- it may break
-// features!
-#ifndef TU_CONFIG_LINK_TO_JPEGLIB
-#define TU_CONFIG_LINK_TO_JPEGLIB 1
-#endif
-
 // define TU_CONFIG_LINK_TO_ZLIB to 0 to exclude zlib code from your
 // build.  Be aware of what you're doing -- it may break features that
 // you need!

Index: libbase/jpeg.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/jpeg.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- libbase/jpeg.cpp    30 Aug 2006 09:00:57 -0000      1.12
+++ libbase/jpeg.cpp    2 May 2007 10:30:09 -0000       1.13
@@ -12,8 +12,6 @@
 #include "tu_file.h"
 #include <cstdio>
 
-#if TU_CONFIG_LINK_TO_JPEGLIB
-
 extern "C" {
 #undef HAVE_STDLIB_H
 #include <jpeglib.h>
@@ -540,32 +538,6 @@
 }
 
 
-#else // not TU_CONFIG_LINK_TO_JPEGLIB
-
-
-namespace jpeg
-{
-       /*static*/ input* input::create(tu_file* in)
-       {
-               return NULL;
-       }
-
-       /*static*/ input* input::create_swf_jpeg2_header_only(tu_file* in)
-       {
-               return NULL;
-       }
-
-       /*static*/ output* output::create(tu_file* out, int width, int height, 
int quality)
-       {
-               return NULL;
-       }
-
-}
-
-
-#endif // not TU_CONFIG_LINK_TO_JPEGLIB
-
-
 // Local Variables:
 // mode: C++
 // c-basic-offset: 8 

Index: server/swf/tag_loaders.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/swf/tag_loaders.cpp,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -b -r1.93 -r1.94
--- server/swf/tag_loaders.cpp  2 May 2007 07:34:35 -0000       1.93
+++ server/swf/tag_loaders.cpp  2 May 2007 10:30:09 -0000       1.94
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: tag_loaders.cpp,v 1.93 2007/05/02 07:34:35 strk Exp $ */
+/* $Id: tag_loaders.cpp,v 1.94 2007/05/02 10:30:09 martinwguy Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -211,12 +211,10 @@
        log_parse(_("  jpeg_tables_loader"));
     );
 
-#if TU_CONFIG_LINK_TO_JPEGLIB
     std::auto_ptr<jpeg::input> 
j_in(jpeg::input::create_swf_jpeg2_header_only(in->get_underlying_stream()));
     assert(j_in.get());
 
     m->set_jpeg_loader(j_in);
-#endif // TU_CONFIG_LINK_TO_JPEGLIB
 }
 
 
@@ -237,7 +235,6 @@
     if (m->get_create_bitmaps() == DO_LOAD_BITMAPS)
     {
        //bitmap_info*  bi = NULL;
-#if TU_CONFIG_LINK_TO_JPEGLIB
        jpeg::input*    j_in = m->get_jpeg_loader();
        assert(j_in);
        j_in->discard_partial_buffer();
@@ -245,11 +242,6 @@
        std::auto_ptr<image::rgb> im ( image::read_swf_jpeg2_with_tables(j_in) 
);
        //bi = render::create_bitmap_info_rgb(im);
        //delete im;
-#else
-       log_error(_("gnash is not linked to jpeglib -- can't load jpeg image 
data"));
-       return;
-#endif
-
 
        //assert(im->get_ref_count() == 0);
 
@@ -289,14 +281,9 @@
     if (m->get_create_bitmaps() == DO_LOAD_BITMAPS)
     {
        //bitmap_info*  bi = NULL;
-#if TU_CONFIG_LINK_TO_JPEGLIB
        std::auto_ptr<image::rgb> im ( 
image::read_jpeg(in->get_underlying_stream()) );
        //bi = render::create_bitmap_info_rgb(im);
        //delete im;
-#else
-       log_error(_("gnash is not linked to jpeglib -- can't load jpeg image 
data"));
-       return;
-#endif
 
        //assert(bi->get_ref_count() == 0);
 
@@ -389,8 +376,8 @@
     if (m->get_create_bitmaps() == DO_LOAD_BITMAPS)
     {
 
-#if TU_CONFIG_LINK_TO_JPEGLIB == 0 || TU_CONFIG_LINK_TO_ZLIB == 0
-       log_error(_("gnash is not linked to jpeglib/zlib -- can't load 
jpeg/zipped image data"));
+#if TU_CONFIG_LINK_TO_ZLIB == 0
+       log_error(_("gnash is not linked to zlib -- can't load jpeg3 image 
data"));
        return;
 #else
        //
@@ -1462,7 +1449,7 @@
        // code here.
        /*if (format == sound_handler::FORMAT_UNCOMPRESSED && sample_16bit)
        {
-#ifndef _TU_LITTLE_ENDIAN_
+#ifndef (?(*!(_TU_LITTLE_ENDIAN_ has gone. Use <boost/detail/endian.hpp>
            // Swap sample bytes to get big-endian format.
            for (int i = 0; i < data_bytes - 1; i += 2)
            {

Index: compatibility_include.h
===================================================================
RCS file: /sources/gnash/gnash/compatibility_include.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- compatibility_include.h     30 Jan 2007 23:05:42 -0000      1.2
+++ compatibility_include.h     2 May 2007 10:30:09 -0000       1.3
@@ -27,10 +27,9 @@
 // Some optional gameswf configuration.
 //
 
-// For disabling zlib and jpeg functionality; you may be able to use
+// For disabling zlib functionality; you may be able to use
 // this in final builds of gameswf, if you preprocess all your SWF
 // content to make unpacked formats.
-// #define TU_CONFIG_LINK_TO_JPEGLIB 0
 // #define TU_CONFIG_LINK_TO_ZLIB 0
 
 // For enabling XML/XMLSocket functionality in gameswf, using GNOME

Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3057
retrieving revision 1.3058
diff -u -b -r1.3057 -r1.3058
--- ChangeLog   2 May 2007 07:34:34 -0000       1.3057
+++ ChangeLog   2 May 2007 10:30:09 -0000       1.3058
@@ -1,3 +1,9 @@
+2007-05-02 Martin Guy <address@hidden>
+
+       * libbase/tu_config.h,libbase/jpeg.cpp,server/swf/tag_loaders.cpp,
+         compatibility_include.h: Having jpeglib is compulsory, so
+         remove TU_CONFIG_LINK_TO_JPEGLIB
+
 2007-05-02 Sandro Santilli <address@hidden>
 
        * backend/sound_handler_gst.cpp, gui/Player.cpp, libamf/amf.cpp,