e8d8834f6a
Also add some patches to remove use of deprecated symbols and fix other problems when looking for or compiling against libpng-1.4.x.
42 lines
1.1 KiB
Text
42 lines
1.1 KiB
Text
$NetBSD: patch-aa,v 1.3 2010/06/13 22:44:40 wiz Exp $
|
|
|
|
Not compatible with png-1.4.
|
|
|
|
--- CompareArgs.cpp.orig 2007-03-16 06:17:17.000000000 +0000
|
|
+++ CompareArgs.cpp
|
|
@@ -35,8 +35,6 @@ static const char *usage =
|
|
\t-gamma g : Value to convert rgb into linear space (default 2.2)\n\
|
|
\t-luminance l : White luminance (default 100.0 cdm^-2)\n\
|
|
\t-output o.ppm : Write difference to the file o.ppm\n\
|
|
-\n\
|
|
-\n Note: Input files can also be in the PNG format\
|
|
\n";
|
|
|
|
CompareArgs::CompareArgs()
|
|
@@ -69,26 +67,18 @@ bool CompareArgs::Parse_Args(int argc, c
|
|
if (i == 1) {
|
|
ImgA = RGBAImage::ReadTiff(argv[1]);
|
|
if (!ImgA) {
|
|
- ImgA = RGBAImage::ReadPNG(argv[1]);
|
|
- if (!ImgA)
|
|
- {
|
|
ErrorStr = "FAIL: Cannot open ";
|
|
ErrorStr += argv[1];
|
|
ErrorStr += "\n";
|
|
return false;
|
|
- }
|
|
}
|
|
} else if (i == 2) {
|
|
ImgB = RGBAImage::ReadTiff(argv[2]);
|
|
if (!ImgB) {
|
|
- ImgB = RGBAImage::ReadPNG(argv[2]);
|
|
- if (!ImgB)
|
|
- {
|
|
ErrorStr = "FAIL: Cannot open ";
|
|
ErrorStr += argv[2];
|
|
ErrorStr += "\n";
|
|
return false;
|
|
- }
|
|
}
|
|
} else {
|
|
if (strstr(argv[i], "-fov")) {
|