2022-12-19 Juan Manuel Guerrero  <juan.guerrero@gmx.de>


	* libmng_jpeg.c: Replace [FALSE|TRUE] by [MNG_FALSE|MNG_TRUE]
	where required.







diff -aprNU5 libmng-2.0.3.orig/libmng_jpeg.c libmng-2.0.3/libmng_jpeg.c
--- libmng-2.0.3.orig/libmng_jpeg.c	2012-07-29 19:26:34 +0000
+++ libmng-2.0.3/libmng_jpeg.c	2022-12-19 22:53:50 +0000
@@ -103,11 +103,11 @@ void mng_init_source (j_decompress_ptr c
 boolean MNG_DECL mng_fill_input_buffer (j_decompress_ptr cinfo)
 #else
 boolean mng_fill_input_buffer (j_decompress_ptr cinfo)
 #endif
 {
-  return FALSE;                        /* force IJG routine to return to caller */
+  return MNG_FALSE;                    /* force IJG routine to return to caller */
 }
 #endif /* MNG_INCLUDE_JNG_READ */
 
 /* ************************************************************************** */
 
@@ -531,11 +531,11 @@ mng_retcode mngjpeg_decompressdata (mng_
     {
       /* call jpeg_read_header() to obtain image info */
 #ifdef MNG_SUPPORT_TRACE
       MNG_TRACE (pData, MNG_FN_JPEG_DECOMPRESSDATA, MNG_LC_JPEG_READ_HEADER)
 #endif
-      if (jpeg_read_header (pData->pJPEGdinfo, TRUE) != JPEG_SUSPENDED)
+      if (jpeg_read_header (pData->pJPEGdinfo, MNG_TRUE) != JPEG_SUSPENDED)
       {                                /* indicate the header's oke */
         pData->bJPEGhasheader = MNG_TRUE;
                                        /* let's do some sanity checks ! */
         if ((pData->pJPEGdinfo->image_width  != pData->iDatawidth ) ||
             (pData->pJPEGdinfo->image_height != pData->iDataheight)    )
@@ -575,17 +575,17 @@ mng_retcode mngjpeg_decompressdata (mng_
     if ((pData->bJPEGhasheader) && (!pData->bJPEGdecostarted))
     {
       /* set parameters for decompression */
 
       if (pData->bJPEGprogressive)     /* progressive display ? */
-        pData->pJPEGdinfo->buffered_image = TRUE;
+        pData->pJPEGdinfo->buffered_image = MNG_TRUE;
 
       /* jpeg_start_decompress(...); */
 #ifdef MNG_SUPPORT_TRACE
       MNG_TRACE (pData, MNG_FN_JPEG_DECOMPRESSDATA, MNG_LC_JPEG_START_DECOMPRESS)
 #endif
-      if (jpeg_start_decompress (pData->pJPEGdinfo) == TRUE)
+      if (jpeg_start_decompress (pData->pJPEGdinfo) == MNG_TRUE)
                                        /* indicate it started */
         pData->bJPEGdecostarted = MNG_TRUE;
 
       pData->pJPEGcurrent   = (mng_uint8p)pData->pJPEGdinfo->src->next_input_byte;
       pData->iJPEGbufremain = (mng_uint32)pData->pJPEGdinfo->src->bytes_in_buffer;
@@ -678,11 +678,11 @@ mng_retcode mngjpeg_decompressdata (mng_
     {
       /* jpeg_finish_decompress(...); */
 #ifdef MNG_SUPPORT_TRACE
       MNG_TRACE (pData, MNG_FN_JPEG_DECOMPRESSDATA, MNG_LC_JPEG_FINISH_DECOMPRESS)
 #endif
-      if (jpeg_finish_decompress (pData->pJPEGdinfo) == TRUE)
+      if (jpeg_finish_decompress (pData->pJPEGdinfo) == MNG_TRUE)
       {                                /* indicate it's done */
         pData->bJPEGhasheader   = MNG_FALSE;
         pData->bJPEGdecostarted = MNG_FALSE;
         pData->pJPEGcurrent     = (mng_uint8p)pData->pJPEGdinfo->src->next_input_byte;
         pData->iJPEGbufremain   = (mng_uint32)pData->pJPEGdinfo->src->bytes_in_buffer;
@@ -885,11 +885,11 @@ mng_retcode mngjpeg_decompressdata2 (mng
     {
       /* call jpeg_read_header() to obtain image info */
 #ifdef MNG_SUPPORT_TRACE
       MNG_TRACE (pData, MNG_FN_JPEG_DECOMPRESSDATA, MNG_LC_JPEG_READ_HEADER)
 #endif
-      if (jpeg_read_header (pData->pJPEGdinfo2, TRUE) != JPEG_SUSPENDED)
+      if (jpeg_read_header (pData->pJPEGdinfo2, MNG_TRUE) != JPEG_SUSPENDED)
       {                                /* indicate the header's oke */
         pData->bJPEGhasheader2 = MNG_TRUE;
                                        /* let's do some sanity checks ! */
         if ((pData->pJPEGdinfo2->image_width  != pData->iDatawidth ) ||
             (pData->pJPEGdinfo2->image_height != pData->iDataheight)    )
@@ -920,17 +920,17 @@ mng_retcode mngjpeg_decompressdata2 (mng
     if ((pData->bJPEGhasheader2) && (!pData->bJPEGdecostarted2))
     {
       /* set parameters for decompression */
 
       if (pData->bJPEGprogressive2)    /* progressive display ? */
-        pData->pJPEGdinfo2->buffered_image = TRUE;
+        pData->pJPEGdinfo2->buffered_image = MNG_TRUE;
 
       /* jpeg_start_decompress(...); */
 #ifdef MNG_SUPPORT_TRACE
       MNG_TRACE (pData, MNG_FN_JPEG_DECOMPRESSDATA, MNG_LC_JPEG_START_DECOMPRESS)
 #endif
-      if (jpeg_start_decompress (pData->pJPEGdinfo2) == TRUE)
+      if (jpeg_start_decompress (pData->pJPEGdinfo2) == MNG_TRUE)
                                        /* indicate it started */
         pData->bJPEGdecostarted2 = MNG_TRUE;
 
       pData->pJPEGcurrent2   = (mng_uint8p)pData->pJPEGdinfo2->src->next_input_byte;
       pData->iJPEGbufremain2 = (mng_uint32)pData->pJPEGdinfo2->src->bytes_in_buffer;
@@ -1015,11 +1015,11 @@ mng_retcode mngjpeg_decompressdata2 (mng
     {
       /* jpeg_finish_decompress(...); */
 #ifdef MNG_SUPPORT_TRACE
       MNG_TRACE (pData, MNG_FN_JPEG_DECOMPRESSDATA, MNG_LC_JPEG_FINISH_DECOMPRESS)
 #endif
-      if (jpeg_finish_decompress (pData->pJPEGdinfo2) == TRUE)
+      if (jpeg_finish_decompress (pData->pJPEGdinfo2) == MNG_TRUE)
       {                                /* indicate it's done */
         pData->bJPEGhasheader2   = MNG_FALSE;
         pData->bJPEGdecostarted2 = MNG_FALSE;
         pData->pJPEGcurrent2     = (mng_uint8p)pData->pJPEGdinfo2->src->next_input_byte;
         pData->iJPEGbufremain2   = (mng_uint32)pData->pJPEGdinfo2->src->bytes_in_buffer;




2022-12-27  Juan Manuel Guerrero  <juan.guerrero@gmx.de>

	Applied all patches taken from libmng_2.0.3+dfsg-4.debian.tar.xz available at
	https://ftp.de.debian.org/debian/pool/main/m/mpeg2dec/.
	See the ChangeLog file for changes.









diff -aprNU5 libmng-2.0.3.orig/doc/man/libmng.3 libmng-2.0.3/doc/man/libmng.3
--- libmng-2.0.3.orig/doc/man/libmng.3	2012-07-29 19:26:34 +0000
+++ libmng-2.0.3/doc/man/libmng.3	2022-12-27 22:47:38 +0000
@@ -12,11 +12,11 @@ The
 .I libmng
 library supports decoding, displaying, encoding, and various other
 manipulations of the Multiple-image Network Graphics (MNG) format
 image files. It uses the
 .IR zlib(3)
-compression library, and optionally the JPEG library by the Independant
+compression library, and optionally the JPEG library by the Independent
 JPEG Group (IJG) and/or lcms (little cms), a color-management library
 by Marti Maria Saguer.
 
 
 .SH I. Introduction
@@ -53,11 +53,11 @@ Further information about zlib, and the
 found at the zlib home page, <http://www.zlib.org/>.
 The zlib compression utility is a general purpose utility that is
 useful for more than MNG/PNG files, and can be used without libmng.
 See the documentation delivered with zlib for more details.
 
-Libmng optionally uses the JPEG library by the Independant JPEG Group
+Libmng optionally uses the JPEG library by the Independent JPEG Group
 (IJG). This library is used for the JNG sub-format, which is part of
 the MNG specification, and allows for inclusion of JPEG decoded and
 thus highly compressed (photographic) images.
 Further information about the IJG JPEG library and the latest sources
 can be found at <http://www.ijg.org/>.
@@ -941,11 +941,11 @@ It is the applications responsibility to
 respect to the timer wait.
 
 
 .SH VI. Writing
 
-The main focus of the library lies in its displaying capabilites.
+The main focus of the library lies in its displaying capabilities.
 But it does offer writing support as well.
 You can create and write a file, or you can write a file you
 have previously read, providing the storage of chunks was enabled
 and active.
 
@@ -1040,11 +1040,11 @@ not finished yet
 
 .SS Compilation directives
 
 not finished yet
 
-.SS Platform dependant modification
+.SS Platform dependent modification
 
 not finished yet
 
 .SH "SEE ALSO"
 .IR mng(5), jng(5), png(5), libpng(3)
