Commit [r163] Maximize Restore History

remove QuickTime dependence - not used on 64 bit Mac OS X

hari 2010-06-26

removed /trunk/src/libimage/WriteImageQT.cpp
removed /trunk/scripts
changed /trunk/config.h.in
changed /trunk/src/libephemeris/libmoons/Makefile.in
changed /trunk/configure.ac
changed /trunk/src/libdisplay/Makefile.in
changed /trunk/acinclude.m4
changed /trunk/src/libsgp4sdp4/Makefile.in
changed /trunk/src/libimage/Makefile.am
changed /trunk/src/libannotate/Makefile.in
changed /trunk/src/Makefile.in
changed /trunk/Makefile.am
changed /trunk/src/printVersion.cpp
changed /trunk/src/libprojection/Makefile.in
changed /trunk/aclocal.m4
changed /trunk/src/libephemeris/Makefile.in
changed /trunk/configure
changed /trunk/Makefile.in
changed /trunk/src/libimage/Makefile.in
changed /trunk/src/libdisplay/DesktopPicture.m
changed /trunk/src/libplanet/Makefile.in
changed /trunk/src/libmultiple/Makefile.in
copied /trunk/src/libimage/ReadImageQT.cpp -> /trunk/pkg.m4
/trunk/scripts
File was removed.
/trunk/config.h.in Diff Switch to side-by-side view
Loading...
/trunk/src/libephemeris/libmoons/Makefile.in Diff Switch to side-by-side view
Loading...
/trunk/configure.ac Diff Switch to side-by-side view
Loading...
/trunk/src/libdisplay/Makefile.in Diff Switch to side-by-side view
Loading...
/trunk/acinclude.m4 Diff Switch to side-by-side view
Loading...
/trunk/src/libsgp4sdp4/Makefile.in Diff Switch to side-by-side view
Loading...
/trunk/src/libimage/Makefile.am Diff Switch to side-by-side view
Loading...
/trunk/src/libannotate/Makefile.in Diff Switch to side-by-side view
Loading...
/trunk/src/Makefile.in Diff Switch to side-by-side view
Loading...
/trunk/Makefile.am Diff Switch to side-by-side view
Loading...
/trunk/src/printVersion.cpp Diff Switch to side-by-side view
Loading...
/trunk/src/libprojection/Makefile.in Diff Switch to side-by-side view
Loading...
/trunk/aclocal.m4 Diff Switch to side-by-side view
Loading...
/trunk/src/libephemeris/Makefile.in Diff Switch to side-by-side view
Loading...
/trunk/configure Diff Switch to side-by-side view
Loading...
/trunk/Makefile.in Diff Switch to side-by-side view
Loading...
/trunk/src/libimage/Makefile.in Diff Switch to side-by-side view
Loading...
/trunk/src/libdisplay/DesktopPicture.m Diff Switch to side-by-side view
Loading...
/trunk/src/libplanet/Makefile.in Diff Switch to side-by-side view
Loading...
/trunk/src/libmultiple/Makefile.in Diff Switch to side-by-side view
Loading...
/trunk/src/libimage/ReadImageQT.cpp to /trunk/pkg.m4
--- a/trunk/src/libimage/ReadImageQT.cpp
+++ b/trunk/pkg.m4
@@ -1,228 +1,157 @@
-#include <cstdio>
-#include <cstring>
-#include <sstream>
-using namespace std;
+# pkg.m4 - Macros to locate and utilise pkg-config.            -*- Autoconf -*-
+# 
+# Copyright Š 2004 Scott James Remnant <scott@netsplit.com>.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
 
-#include <QuickTime/QuickTime.h>
+# PKG_PROG_PKG_CONFIG([MIN-VERSION])
+# ----------------------------------
+AC_DEFUN([PKG_PROG_PKG_CONFIG],
+[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
+m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
+AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl
+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+	AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
+fi
+if test -n "$PKG_CONFIG"; then
+	_pkg_min_version=m4_default([$1], [0.9.0])
+	AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
+	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
+		AC_MSG_RESULT([yes])
+	else
+		AC_MSG_RESULT([no])
+		PKG_CONFIG=""
+	fi
+		
+fi[]dnl
+])# PKG_PROG_PKG_CONFIG
 
-#include "xpUtil.h"
+# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+#
+# Check to see whether a particular set of modules exists.  Similar
+# to PKG_CHECK_MODULES(), but does not set variables or print errors.
+#
+#
+# Similar to PKG_CHECK_MODULES, make sure that the first instance of
+# this or PKG_CHECK_MODULES is called, or make sure to call
+# PKG_CHECK_EXISTS manually
+# --------------------------------------------------------------
+AC_DEFUN([PKG_CHECK_EXISTS],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+if test -n "$PKG_CONFIG" && \
+    AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
+  m4_ifval([$2], [$2], [:])
+m4_ifvaln([$3], [else
+  $3])dnl
+fi])
 
-// This code is based on the QTtoCG example at
-// http://developer.apple.com/samplecode/QTtoCG/QTtoCG.html
-typedef struct {
-    size_t width;
-    size_t height;
-    size_t bitsPerComponent;
-    size_t bitsPerPixel;
-    size_t bytesPerRow;
-    size_t size;
-    CGImageAlphaInfo ai;
-    CGColorSpaceRef cs;
-    unsigned char *data;
-    CMProfileRef prof;
-} BitmapInfo;
 
-static bool
-readBitmapInfo(GraphicsImportComponent gi, BitmapInfo *bi)
-{
-    ImageDescriptionHandle imageDescH = NULL;
-    ComponentResult result = GraphicsImportGetImageDescription(gi, 
-                                                               &imageDescH);
-    if( noErr != result || imageDescH == NULL ) 
-    {
-        xpWarn("Error while retrieving image description\n", 
-               __FILE__, __LINE__);
-        return(false);
-    }
-        
-    ImageDescription *desc = *imageDescH;
-        
-    bi->width = desc->width;
-    bi->height = desc->height;
-    bi->bitsPerComponent = 8;
-    bi->bitsPerPixel = 32;
-    bi->bytesPerRow = (bi->bitsPerPixel * bi->width + 7)/8;
-    bi->ai = (desc->depth == 32) ? kCGImageAlphaFirst : kCGImageAlphaNoneSkipFirst;
-    bi->size = bi->bytesPerRow * bi->height;
-    bi->data = (unsigned char *) malloc(bi->size);
-        
-    bi->cs = NULL;
-    bi->prof = NULL;
+# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
+# ---------------------------------------------
+m4_define([_PKG_CONFIG],
+[if test -n "$PKG_CONFIG"; then
+    if test -n "$$1"; then
+        pkg_cv_[]$1="$$1"
+    else
+        PKG_CHECK_EXISTS([$3],
+                         [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
+			 [pkg_failed=yes])
+    fi
+else
+	pkg_failed=untried
+fi[]dnl
+])# _PKG_CONFIG
 
-// skip the profile
-#if 0
-    Handle profile = NULL;
-    GraphicsImportGetColorSyncProfile(gi, &profile);
+# _PKG_SHORT_ERRORS_SUPPORTED
+# -----------------------------
+AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi[]dnl
+])# _PKG_SHORT_ERRORS_SUPPORTED
 
-    if( NULL != profile ) 
-    {
-        CMError err;
-        CMProfileLocation profLoc;
-        Boolean bValid, bPreferredCMMNotFound;
-                
-        profLoc.locType = cmHandleBasedProfile;
-        profLoc.u.handleLoc.h = profile;
-                
-        err = CMOpenProfile(&bi->prof, &profLoc);
-        if( err != noErr ) 
-        {
-            xpWarn("Cannot open profile\n", __FILE__, __LINE__);
-            return(false);
-        }
-                
-        /* Not necessary to validate profile, but good for debugging */
-        err = CMValidateProfile(bi->prof, &bValid, &bPreferredCMMNotFound);
-        if( err != noErr ) 
-        {
-            ostringstream errStr;
-            errStr << "Cannot validate profile : Valid: " << bValid 
-                   << ", Preferred CMM not found : " 
-                   << bPreferredCMMNotFound << "\n";
-            xpWarn(errStr.str(), __FILE__, __LINE__);
-            return(false);
-        }
-                
-        bi->cs = CGColorSpaceCreateWithPlatformColorSpace( &bi->prof );
-                
-        if( bi->cs == NULL ) 
-        {
-            xpWarn("Error creating cg colorspace from csync profile\n", 
-                   __FILE__, __LINE__);
-            return(false);
-        }
-        xpMsg("Embedded profile found in image\n", __FILE__, __LINE__);
-        DisposeHandle(profile);
-    }  
-#endif
 
-    if( imageDescH != NULL)
-        DisposeHandle((Handle)imageDescH);
+# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
+# [ACTION-IF-NOT-FOUND])
+#
+#
+# Note that if there is a possibility the first call to
+# PKG_CHECK_MODULES might not happen, you should be sure to include an
+# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
+#
+#
+# --------------------------------------------------------------
+AC_DEFUN([PKG_CHECK_MODULES],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
+AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
 
-    return(true);
-}
+pkg_failed=no
+AC_MSG_CHECKING([for $1])
 
-static bool
-getBitmapData(GraphicsImportComponent gi, BitmapInfo *bi)
-{
-    GWorldPtr gWorld;
-    QDErr err = noErr;
-    Rect boundsRect = { 0, 0, bi->height, bi->width };
-    ComponentResult result;
-        
-    if( bi->data == NULL ) 
-    {
-        xpWarn("no bitmap buffer available\n", __FILE__, __LINE__);
-        return(false);
-    }
-        
-    err = NewGWorldFromPtr( &gWorld, k32ARGBPixelFormat, &boundsRect, 
-                            NULL, NULL, 0, (char *) bi->data, 
-                            bi->bytesPerRow );
-    if (noErr != err) 
-    {
-        ostringstream errStr;
-        errStr << "error creating new gworld - " << err << "\n";
-        xpWarn(errStr.str(), __FILE__, __LINE__);
-        return(false);
-    }
-        
-    if( (result = GraphicsImportSetGWorld(gi, gWorld, NULL)) != noErr ) 
-    {
-        xpWarn("error while setting gworld\n", __FILE__, __LINE__);
-        return(false);
-    }
-        
-    if( (result = GraphicsImportDraw(gi)) != noErr ) 
-    {
-        xpWarn("error while drawing image through qt\n", __FILE__, __LINE__);
-        return(false);
-    }
-        
-    DisposeGWorld(gWorld);
+_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
+_PKG_CONFIG([$1][_LIBS], [libs], [$2])
 
-    return(true);
-}
+m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
+and $1[]_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.])
 
-bool 
-ReadImage(const char *filename, int &width, int &height, 
-          unsigned char *&rgb_data, unsigned char *&png_alpha)
-{
-    FSRef ref;
-    OSStatus status = FSPathMakeRef((const UInt8 *) filename, &ref, NULL);
-    if (status != noErr) 
-    {
-        ostringstream errStr;
-        errStr << "Can't make FSRef for " << filename << "\n";
-        xpWarn(errStr.str(), __FILE__, __LINE__);
-        return(false);
-    }
-        
-    FSSpec spec;
-    OSErr err = FSGetCatalogInfo(&ref, kFSCatInfoNone, NULL, NULL, 
-                                 &spec, NULL);
-    if (err != noErr) 
-    {
-        ostringstream errStr;
-        errStr << "Can't make FSSpec for " << filename << "\n";
-        xpWarn(errStr.str(), __FILE__, __LINE__);
-        return(false);
-    }
+if test $pkg_failed = yes; then
+        _PKG_SHORT_ERRORS_SUPPORTED
+        if test $_pkg_short_errors_supported = yes; then
+	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"`
+        else 
+	        $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
 
-    GraphicsImportComponent gi;
-    GetGraphicsImporterForFile(&spec, &gi);
-    if (gi == NULL)
-    {
-        ostringstream errStr;
-        errStr << "Can't get GraphicsImporter for " << filename << "\n";
-        xpWarn(errStr.str(), __FILE__, __LINE__);
-        return(false);
-    }
+	ifelse([$4], , [AC_MSG_ERROR(dnl
+[Package requirements ($2) were not met:
 
-    BitmapInfo bi;
+$$1_PKG_ERRORS
 
-    if (!readBitmapInfo(gi, &bi) 
-        || !getBitmapData(gi, &bi)) 
-    {
-        ostringstream errStr;
-        errStr << "Can't get bitmap for " << filename << "\n";
-        xpWarn(errStr.str(), __FILE__, __LINE__);
-        return(false);
-    }
-    
-    CloseComponent(gi);
-        
-    width = static_cast<int> (bi.width);
-    height = static_cast<int> (bi.height);
-    int area = width * height;
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
 
-    rgb_data = (unsigned char *) malloc(3 * area);
-    if (bi.ai == kCGImageAlphaFirst)
-    {
-        png_alpha = (unsigned char *) malloc(area);
-        unsigned char *rgbPtr = rgb_data;
-        unsigned char *pngPtr = png_alpha;
-        unsigned char *bitPtr = bi.data;
-        for (int i = 0; i < area; i++)
-        {
-            *pngPtr++ = *bitPtr++;
-            memcpy(rgbPtr, bitPtr, 3);
-            rgbPtr += 3;
-            bitPtr += 3;
-        }
-    }
-    else // no alpha channel
-    {
-        unsigned char *rgbPtr = rgb_data;
-        unsigned char *bitPtr = bi.data;
-        bitPtr++;
-        for (int i = 0; i < area; i++)
-        {
-            memcpy(rgbPtr, bitPtr, 3);
-            rgbPtr += 3;
-            bitPtr += 4;
-        }
-    }
-    free(bi.data);
+_PKG_TEXT
+])],
+		[AC_MSG_RESULT([no])
+                $4])
+elif test $pkg_failed = untried; then
+	ifelse([$4], , [AC_MSG_FAILURE(dnl
+[The pkg-config script could not be found or is too old.  Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
 
-    return(true);
-}
+_PKG_TEXT
+
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.])],
+		[$4])
+else
+	$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
+	$1[]_LIBS=$pkg_cv_[]$1[]_LIBS
+        AC_MSG_RESULT([yes])
+	ifelse([$3], , :, [$3])
+fi[]dnl
+])# PKG_CHECK_MODULES