[Emacs-diffs] Changes to emacs/src/image.c [lexbind]

[Miles Bader]

Index: emacs/src/image.c
diff -c emacs/src/image.c:1.6.2.10 emacs/src/image.c:1.6.2.11
*** emacs/src/image.c:1.6.2.10  Sat Sep  4 09:20:10 2004
--- emacs/src/image.c   Wed Dec  8 23:36:21 2004
***************
*** 2416,2423 ****
          UNGCPRO;
          return 0;
        }
!       path = CFStringCreateWithCString (NULL, SDATA (file),
!                                       kCFStringEncodingUTF8);
        url = CFURLCreateWithFileSystemPath (NULL, path,
                                           kCFURLPOSIXPathStyle, 0);
        CFRelease (path);
--- 2416,2422 ----
          UNGCPRO;
          return 0;
        }
!       path = cfstring_create_with_utf8_cstring (SDATA (file));
        url = CFURLCreateWithFileSystemPath (NULL, path,
                                           kCFURLPOSIXPathStyle, 0);
        CFRelease (path);
***************
*** 6379,6385 ****
  
    src->next_input_byte = buffer;
    src->bytes_in_buffer = 2;
!   return TRUE;
  }
  
  
--- 6378,6384 ----
  
    src->next_input_byte = buffer;
    src->bytes_in_buffer = 2;
!   return 1;
  }
  
  
***************
*** 6534,6544 ****
      jpeg_memory_src (&cinfo, SDATA (specified_data),
                     SBYTES (specified_data));
  
!   fn_jpeg_read_header (&cinfo, TRUE);
  
    /* Customize decompression so that color quantization will be used.
         Start decompression.  */
!   cinfo.quantize_colors = TRUE;
    fn_jpeg_start_decompress (&cinfo);
    width = img->width = cinfo.output_width;
    height = img->height = cinfo.output_height;
--- 6533,6543 ----
      jpeg_memory_src (&cinfo, SDATA (specified_data),
                     SBYTES (specified_data));
  
!   fn_jpeg_read_header (&cinfo, 1);
  
    /* Customize decompression so that color quantization will be used.
         Start decompression.  */
!   cinfo.quantize_colors = 1;
    fn_jpeg_start_decompress (&cinfo);
    width = img->width = cinfo.output_width;
    height = img->height = cinfo.output_height;
***************
*** 7553,7559 ****
    bg_color.blue = color.blue;
    RGBBackColor (&bg_color);
    SetGWorld (old_port, old_gdh);
!   SetMovieActive (movie, TRUE);
    SetMovieGWorld (movie, ximg, NULL);
    SampleNumToMediaTime (media, ino + 1, &time, NULL);
    SetMovieTimeValue (movie, time);
--- 7552,7558 ----
    bg_color.blue = color.blue;
    RGBBackColor (&bg_color);
    SetGWorld (old_port, old_gdh);
!   SetMovieActive (movie, 1);
    SetMovieGWorld (movie, ximg, NULL);
    SampleNumToMediaTime (media, ino + 1, &time, NULL);
    SetMovieTimeValue (movie, time);
***************
*** 7931,7937 ****
    define_image_type (image_type, init_lib_fn (libraries))
  #else
  #define CHECK_LIB_AVAILABLE(image_type, init_lib_fn, libraries) \
!   define_image_type (image_type, TRUE)
  #endif /* HAVE_NTGUI */
  
  DEFUN ("init-image-library", Finit_image_library, Sinit_image_library, 2, 2, 
0,
--- 7930,7936 ----
    define_image_type (image_type, init_lib_fn (libraries))
  #else
  #define CHECK_LIB_AVAILABLE(image_type, init_lib_fn, libraries) \
!   define_image_type (image_type, 1)
  #endif /* HAVE_NTGUI */
  
  DEFUN ("init-image-library", Finit_image_library, Sinit_image_library, 2, 2, 
0,
***************
*** 8115,8122 ****
  {
    image_types = NULL;
  
!   define_image_type (&xbm_type, TRUE);
!   define_image_type (&pbm_type, TRUE);
  
  #ifdef MAC_OS
    /* Animated gifs use QuickTime Movie Toolbox.  So initialize it here. */
--- 8114,8121 ----
  {
    image_types = NULL;
  
!   define_image_type (&xbm_type, 1);
!   define_image_type (&pbm_type, 1);
  
  #ifdef MAC_OS
    /* Animated gifs use QuickTime Movie Toolbox.  So initialize it here. */