Remove unnnecessary length remaining check.

Fix pkg-config dependencies.
2025-06-07 05:54:23 +02:00 · 2025-02-22 11:04:31 -05:00 · 2025-02-22 08:30:38 -05:00
4 changed files with 4 additions and 7 deletions
--- a/2
+++ b/2
@ -4128,8 +4128,8 @@ printf "%s\n" "#define HAVE_LIBPNG 1" >>confdefs.h

 	CPPFLAGS="$($PKGCONFIG --cflags libpng16) -DHAVE_LIBPNG=1 $CPPFLAGS"
 	LIBS="$($PKGCONFIG --libs libpng16) -lz $LIBS"
-	PKGCONFIG_LIBPNG="libpng >= 1.6,"
 	PKGCONFIG_LIBS_PRIVATE="$($PKGCONFIG --libs libpng16) $PKGCONFIG_LIBS_PRIVATE"
+	PKGCONFIG_REQUIRES="libpng >= 1.6,$PKGCONFIG_REQUIRES"

 else $as_nop

--- a/configure.ac
+++ b/configure.ac
@ -134,8 +134,8 @@ AS_IF([test "x$PKGCONFIG" != x -a x$enable_libpng != xno], [
 	AC_DEFINE([HAVE_LIBPNG], 1, [Have PNG library?])
 	CPPFLAGS="$($PKGCONFIG --cflags libpng16) -DHAVE_LIBPNG=1 $CPPFLAGS"
 	LIBS="$($PKGCONFIG --libs libpng16) -lz $LIBS"
-	PKGCONFIG_LIBPNG="libpng >= 1.6,"
 	PKGCONFIG_LIBS_PRIVATE="$($PKGCONFIG --libs libpng16) $PKGCONFIG_LIBS_PRIVATE"
+	PKGCONFIG_REQUIRES="libpng >= 1.6,$PKGCONFIG_REQUIRES"
    ], [
 	AC_MSG_RESULT([no]);
 	AS_IF([test x$enable_libpng = xyes], [
--- a/pdfio-content.c
+++ b/pdfio-content.c
@ -2587,9 +2587,6 @@ copy_jpeg(pdfio_dict_t *dict,		// I - Dictionary
 	  length = 0;
 	}
      }
-
-      if (length > 0)
-	break;
    }
  }

--- a/pdfio.pc.in
+++ b/pdfio.pc.in
@ -7,7 +7,7 @@ Name: pdfio
 Description: PDF read/write library
 Version: @PDFIO_VERSION@
 URL: https://www.msweet.org/pdfio
-Requires: @PKGCONFIG_REQUIRES@
+Cflags: @PKGCONFIG_CFLAGS@
 Libs: @PKGCONFIG_LIBS@
 Libs.private: @PKGCONFIG_LIBS_PRIVATE@
-Cflags: @PKGCONFIG_CFLAGS@
+Requires: @PKGCONFIG_REQUIRES@
Author	SHA1	Message	Date
Michael R Sweet	6e2e4bbcc6	Remove unnnecessary length remaining check.	2025-02-22 11:04:31 -05:00
Michael R Sweet	d535067c91	Fix pkg-config dependencies.	2025-02-22 08:30:38 -05:00