Commit 6d53201a authored by bp's avatar bp
Browse files

PNG 1.5 wie PNG 1.4 behandeln 

git-svn-id: https://forth-ev.de/repos/bigforth@2530 3b8d8251-53f3-0310-8f3b-fd1cb8370982
parent f7e6f21d

png.fs

+19 −11
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ library: libpng12.so.0 
	    s" libpng12.so.0" getlib 0<> Value newpng

	    true Value png3

	    false Value png14

	    false Value png15

	    

	    newpng [IF]

		library libpng libpng12.so.0
@@ -59,6 +60,10 @@ library: libpng12.so.0 
	    

	    : init-png-lib ( -- )

		& libpng cell+ @ ?EXIT  true to png3

		s" libpng15.so.15" getlib 0<> to png15

		png15 IF

		    s" libpng15.so.15" true to newpng

		ELSE

		    s" libpng14.so.14" getlib 0<> to png14

		    png14 IF

			s" libpng14.so.14" true to newpng
@@ -69,6 +74,7 @@ library: libpng12.so.0 
			    png3  IF  s" libpng.so.3"  ELSE  s" libpng.so.2"  THEN

			THEN

		    THEN

		THEN

		2dup getlib 0= IF  display ." Failed to load PNGlib " type cr bye  THEN

		& libpng 4 cells + place ;

	    [THEN]
@@ -101,10 +107,12 @@ Variable user_error_ptr 


: init-png ( -- infostruc readstruc )

    init-png-lib

    png15 IF  0" 1.5.0"  ELSE

	png14 IF  0" 1.4.0"  ELSE

	    png3 IF  0" 1.2.0"

	    ELSE  0" 1.0.5"  THEN

	THEN

    THEN

    user_error_ptr ['] noop dup png_create_read_struct

    dup 0= abort" PNG: no read structure"

    info-struct dup setjmp IF