Re: [Caml-list] camlimages problems on mac

[Pierre-Etienne Meunier <pierreetienne.meunier@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 639 bytes --]

A while ago, I sent Pierre Weis a patch to make camlimages compatible with the new versions of libpng. I do not know if he used it, but please find it attached. This should solve the first problem. Next, there is a bug in omake, which prevents the libraries from being detected properly. The "dummy" version of the files get used instead of the correct ones. A friend of mine, Florian Hatat, sent a correction for ubuntu. We did not test it on mac.

Maybe some ocamlbuild expert could write some tags to make camlimages compile with ocamlbuild ? This library is really useful, only the build system is hard to use.

Cheers,
Pierre


[-- Attachment #2: png.diff --]
[-- Type: application/octet-stream, Size: 2042 bytes --]

--- src/pngwrite.c.old	2011-06-22 20:04:32.000000000 +0200
+++ src/pngwrite.c	2012-10-19 09:26:26.000000000 +0200
@@ -62,7 +62,7 @@
   }
 
   /* error handling */
-  if (setjmp(png_ptr->jmpbuf)) {
+  if (setjmp(png_jmpbuf(png_ptr))) {
     /* Free all of the memory associated with the png_ptr and info_ptr */
     png_destroy_write_struct(&png_ptr, &info_ptr);
     fclose(fp);
@@ -171,7 +171,7 @@
   }
 
   /* error handling */
-  if (setjmp(png_ptr->jmpbuf)) {
+  if (setjmp(png_jmpbuf(png_ptr))) {
     /* Free all of the memory associated with the png_ptr and info_ptr */
     png_destroy_write_struct(&png_ptr, &info_ptr);
     fclose(fp);
--- src/pngread.c.old	2011-06-22 20:04:32.000000000 +0200
+++ src/pngread.c	2012-10-19 09:26:36.000000000 +0200
@@ -69,7 +69,7 @@
   }
 
   /* error handling */
-  if (setjmp(png_ptr->jmpbuf)) {
+  if (setjmp(png_jmpbuf(png_ptr))) {
     /* Free all of the memory associated with the png_ptr and info_ptr */
     png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL);
     fclose(fp);
@@ -134,7 +134,7 @@
     png_set_rows(png_ptr, info_ptr, row_pointers);
 
     /* Later, we can return something */
-    if (setjmp(png_ptr->jmpbuf)) {
+    if (setjmp(png_jmpbuf(png_ptr))) {
       /* Free all of the memory associated with the png_ptr and info_ptr */
       png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL);
       fclose(fp);
@@ -243,7 +243,7 @@
   }
 
   /* error handling */
-  if (setjmp(png_ptr->jmpbuf)) {
+  if (setjmp(png_jmpbuf(png_ptr))) {
     /* Free all of the memory associated with the png_ptr and info_ptr */
     png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL);
     fclose(fp);
@@ -302,7 +302,7 @@
     png_set_rows(png_ptr, info_ptr, row_pointers);
 
     /* Later, we can return something */
-    if (setjmp(png_ptr->jmpbuf)) {
+    if (setjmp(png_jmpbuf(png_ptr))) {
       /* Free all of the memory associated with the png_ptr and info_ptr */
       png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL);
       fclose(fp);

[-- Attachment #3: Type: text/plain, Size: 954 bytes --]





Em 07/11/2012, às 09:52, Samuel Hornus escreveu:

> 
> Hello,
> 
> When installing camlimages 4.0.1 with MacPort (Mac OS X 10.7.5, Latest MacPorts),
> the resulting camlimages has no support for JPEG, PNG, PPM, XPM, etc… which makes it sort of useless.
> 
> When compiling the source using omake, the same happens. It can find the header files, but can't find specific functions inside.
> 
> The source code for camlimages seems perhaps outdated w.r.t. changes in the API of libpng, libjpg, giflib, tifflib, etc… 
> 
> Could anyone confirms this dire state of affairs? Is there a "modernizer" patch floating around? or some work in progress? Is it the same on Linux?
> 
> Thank you,
> Samuel
> -- 
> Caml-list mailing list.  Subscription management and archives:
> https://sympa.inria.fr/sympa/arc/caml-list
> Beginner's list: http://groups.yahoo.com/group/ocaml_beginners
> Bug reports: http://caml.inria.fr/bin/caml-bugs