smani pushed to mingw-leptonica (f21). "Update to 1.72"

[notifications at fedoraproject.org]

>From 3fac061d2df15cc9451e7dfb412aeed631d40725 Mon Sep 17 00:00:00 2001
From: Sandro Mani <manisandro at gmail.com>
Date: Mon, 27 Apr 2015 14:37:01 +0200
Subject: Update to 1.72


diff --git a/.gitignore b/.gitignore
index ca4e693..4fd3e66 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /leptonica-1.69.tar.gz
 /leptonica-1.71.tar.gz
+/leptonica-1.72.tar.gz
diff --git a/leptonica_giflib5.patch b/leptonica_giflib5.patch
deleted file mode 100644
index d93d03e..0000000
--- a/leptonica_giflib5.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-diff -rupN leptonica-1.69/src/gifio.c leptonica-1.69-new/src/gifio.c
---- leptonica-1.69/src/gifio.c	2012-01-22 19:29:15.000000000 +0100
-+++ leptonica-1.69-new/src/gifio.c	2013-08-09 01:15:40.010226100 +0200
-@@ -100,7 +100,11 @@ SavedImage       si;
-     _lseek(fd, 0, SEEK_SET);
- #endif  /* _MSC_VER */
- 
-+#if GIFLIB_MAJOR >= 5
-+    if ((gif = DGifOpenFileHandle(fd, NULL)) == NULL)
-+#else
-     if ((gif = DGifOpenFileHandle(fd)) == NULL)
-+#endif
-         return (PIX *)ERROR_PTR("invalid file or file not found",
-                                 procName, NULL);
- 
-@@ -316,7 +320,11 @@ GifByteType     *gif_line;
-     }
- 
-         /* Save the cmap colors in a gif_cmap */
-+#if GIFLIB_MAJOR >= 5
-+    if ((gif_cmap = GifMakeMapObject(gif_ncolor, NULL)) == NULL) {
-+#else
-     if ((gif_cmap = MakeMapObject(gif_ncolor, NULL)) == NULL) {
-+#endif
-         pixDestroy(&pixd);
-         return ERROR_INT("failed to create GIF color map", procName, 1);
-     }
-@@ -325,7 +333,11 @@ GifByteType     *gif_line;
-         if (ncolor > 0) {
-             if (pixcmapGetColor(cmap, i, &rval, &gval, &bval) != 0) {
-                 pixDestroy(&pixd);
-+#if GIFLIB_MAJOR >= 5
-+                GifFreeMapObject(gif_cmap);
-+#else
-                 FreeMapObject(gif_cmap);
-+#endif
-                 return ERROR_INT("failed to get color from color map",
-                                  procName, 1);
-             }
-@@ -337,9 +349,17 @@ GifByteType     *gif_line;
-     }
- 
-         /* Get the gif file handle */
-+#if GIFLIB_MAJOR >= 5
-+    if ((gif = EGifOpenFileHandle(fd, NULL)) == NULL) {
-+#else
-     if ((gif = EGifOpenFileHandle(fd)) == NULL) {
-+#endif
-         pixDestroy(&pixd);
-+#if GIFLIB_MAJOR >= 5
-+        GifFreeMapObject(gif_cmap);
-+#else
-         FreeMapObject(gif_cmap);
-+#endif
-         return ERROR_INT("failed to create GIF image handle", procName, 1);
-     }
- 
-@@ -347,11 +367,19 @@ GifByteType     *gif_line;
-     if (EGifPutScreenDesc(gif, w, h, gif_cmap->BitsPerPixel, 0, gif_cmap)
-         != GIF_OK) {
-         pixDestroy(&pixd);
-+#if GIFLIB_MAJOR >= 5
-+        GifFreeMapObject(gif_cmap);
-+#else
-         FreeMapObject(gif_cmap);
-+#endif
-         EGifCloseFile(gif);
-         return ERROR_INT("failed to write screen description", procName, 1);
-     }
-+#if GIFLIB_MAJOR >= 5
-+    GifFreeMapObject(gif_cmap); /* not needed after this point */
-+#else
-     FreeMapObject(gif_cmap); /* not needed after this point */
-+#endif
- 
-     if (EGifPutImageDesc(gif, 0, 0, w, h, FALSE, NULL) != GIF_OK) {
-         pixDestroy(&pixd);
diff --git a/leptonica_typo.patch b/leptonica_typo.patch
deleted file mode 100644
index 84da09a..0000000
--- a/leptonica_typo.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -rupN leptonica-1.69/src/utils.c leptonica-1.69-new/src/utils.c
---- leptonica-1.69/src/utils.c	2012-01-22 19:29:15.000000000 +0100
-+++ leptonica-1.69-new/src/utils.c	2013-05-08 02:36:37.967624152 +0200
-@@ -2298,7 +2298,7 @@ lept_direxists(const char  *dirname,
-     HANDLE  hFind = INVALID_HANDLE_VALUE;
-     WIN32_FIND_DATAA  ffd;
-         hFind = FindFirstFileA(dirname, &ffd);
--        if (hfind != INVALID_HANDLE_VALUE) {
-+        if (hFind != INVALID_HANDLE_VALUE) {
-             *pexists = 1;
-             FindClose(hFind);
-         }
diff --git a/mingw-leptonica.spec b/mingw-leptonica.spec
index aaacd02..67e13ce 100644
--- a/mingw-leptonica.spec
+++ b/mingw-leptonica.spec
@@ -3,7 +3,7 @@
 %global pkgname leptonica
 
 Name:          mingw-%{pkgname}
-Version:       1.71
+Version:       1.72
 Release:       1%{?dist}
 Summary:       MinGW Windows Leptonica library
 
@@ -93,7 +93,8 @@ rm -rf %{buildroot}%{mingw64_bindir}/*.exe
 
 
 %files -n mingw32-%{pkgname}
-%doc leptonica-license.txt README.html version-notes.html
+%license leptonica-license.txt
+%doc README.html version-notes.html
 %{mingw32_bindir}/liblept-4.dll
 %{mingw32_includedir}/leptonica/
 %{mingw32_libdir}/liblept.dll.a
@@ -103,7 +104,8 @@ rm -rf %{buildroot}%{mingw64_bindir}/*.exe
 %{mingw32_libdir}/liblept.a
 
 %files -n mingw64-%{pkgname}
-%doc leptonica-license.txt README.html version-notes.html
+%license leptonica-license.txt
+%doc README.html version-notes.html
 %{mingw64_bindir}/liblept-4.dll
 %{mingw64_includedir}/leptonica/
 %{mingw64_libdir}/liblept.dll.a
@@ -114,6 +116,9 @@ rm -rf %{buildroot}%{mingw64_bindir}/*.exe
 
 
 %changelog
+* Mon Apr 27 2015 Sandro Mani <manisandro at gmail.com> - 1.72-1
+- Update to 1.72
+
 * Wed Aug 13 2014 Sandro Mani <manisandro at gmail.com> - 1.71-1
 - Update to 1.71
 
diff --git a/sources b/sources
index 15b8421..bb44658 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-790f34d682e6150c12c54bfe4a824f7f  leptonica-1.71.tar.gz
+7581db29f8442197ce68e766c6047c4b  leptonica-1.72.tar.gz
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/mingw-leptonica.git/commit/?h=f21&id=3fac061d2df15cc9451e7dfb412aeed631d40725