diff --git a/ChangeLog b/ChangeLog index 5c719d77d8..c3a619d99f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,17 +1,6 @@ 2005-12-14 Michael Natterer - * gdk-pixbuf/io-jpeg.c (gdk_pixbuf__jpeg_image_load_lines): new - utility function which factors out massive code duplication from - the commit below. - -2005-12-14 Michael Natterer - - * gdk-pixbuf/io-jpeg.c: applied patch from maemo-gtk which avoids - the allocation of an intermediate buffer for non-progressive - jpegs. Fixed bug #305894. - - * tests/test-images/valid_jpeg_progressive_test: new test image so - we can test both loading code paths in io-jpeg.c + * tests/test-images/valid_jpeg_progressive_test: new test image. Tue Dec 13 09:47:20 2005 Tim Janik diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 5c719d77d8..c3a619d99f 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,17 +1,6 @@ 2005-12-14 Michael Natterer - * gdk-pixbuf/io-jpeg.c (gdk_pixbuf__jpeg_image_load_lines): new - utility function which factors out massive code duplication from - the commit below. - -2005-12-14 Michael Natterer - - * gdk-pixbuf/io-jpeg.c: applied patch from maemo-gtk which avoids - the allocation of an intermediate buffer for non-progressive - jpegs. Fixed bug #305894. - - * tests/test-images/valid_jpeg_progressive_test: new test image so - we can test both loading code paths in io-jpeg.c + * tests/test-images/valid_jpeg_progressive_test: new test image. Tue Dec 13 09:47:20 2005 Tim Janik diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog index d6dc0421d5..66f5af1296 100644 --- a/gdk-pixbuf/ChangeLog +++ b/gdk-pixbuf/ChangeLog @@ -1,3 +1,15 @@ +2005-12-14 Michael Natterer + + * io-jpeg.c (gdk_pixbuf__jpeg_image_load_lines): new utility + function which factors out massive code duplication from the + commit below. + +2005-12-14 Michael Natterer + + * io-jpeg.c: applied patch from maemo-gtk which avoids the + allocation of an intermediate buffer for non-progressive + jpegs. Fixed bug #305894. + 2005-11-15 Matthias Clasen * io-xpm.c: Fix several integer overflows which have been