gmane.comp.web.pel.cvs

[513] trunk/build.xml

2008-06-08T10:28:09

Revision: 513 http://pel.svn.sourceforge.net/pel/?rev=513&view=rev Author: lsolesen Date: 2008-06-08 03:28:07 -0700 (Sun, 08 Jun 2008) Log Message: ----------- Started a build file so it is easier to make a pear package. Added Paths: ----------- trunk/build.xml Added: trunk/build.xml =================================================================== --- trunk/build.xml (rev 0) +++ trunk/build.xml2008-06-08 10:28:07 UTC (rev 513) < at >< at > -0,0 +1,117 < at >< at > + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${package-name} +

The PHP Exif Library (PEL) lets you fully manipulate Exif (Exchangeable Image File Format) data.

+ ${pear.channel} + + + The PHP Exif Library (PEL) lets you fully + manipulate Exif (Exchangeable Image File Format) + data. This is the data that digital cameras + place in their images, such as the date and time, + shutter speed, ISO value and so on. + + Using PEL, one can fully modify the Exif data, + meaning that it can be both read and written. + Completely new Exif data can also be added to + images. PEL is written completely in PHP and + depends on nothing except a standard installation + of PHP, version 5. PEL is hosted on SourceForge. + + + + + GPL License + + + + + + + + + + + * Something + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ------------------------------------------------------------------------- Check out the new SourceForge.net Marketplace. It's the best place to buy or sell services for just about anything Open Source. http://sourceforge.net/services/buy/index.php

[512] trunk/test

2008-04-28T15:29:26

Revision: 512 http://pel.svn.sourceforge.net/pel/?rev=512&view=rev Author: lsolesen Date: 2008-04-28 08:29:26 -0700 (Mon, 28 Apr 2008) Log Message: ----------- Added test for bug 1730993. Haven't figured out what the expected behavior should be. Added Paths: ----------- trunk/test/bug1730993.php trunk/test/images/ trunk/test/images/bug1730993_large.jpg trunk/test/images/bug1730993_tmp.jpg Added: trunk/test/bug1730993.php =================================================================== --- trunk/test/bug1730993.php (rev 0) +++ trunk/test/bug1730993.php2008-04-28 15:29:26 UTC (rev 512) < at >< at > -0,0 +1,43 < at >< at > +getExif(); + if ($exif != null) { + $jpeg1 = new PelJpeg($bigfile); + $jpeg1->setExif( $exif); + file_put_contents($bigfile, $jpeg1->getBytes()); + } + } +} + +?> \ No newline at end of file Added: trunk/test/images/bug1730993_large.jpg =================================================================== (Binary files differ) Property changes on: trunk/test/images/bug1730993_large.jpg ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/test/images/bug1730993_tmp.jpg =================================================================== (Binary files differ) Property changes on: trunk/test/images/bug1730993_tmp.jpg ___________________________________________________________________ Name: svn:mime-type + application/octet-stream This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ------------------------------------------------------------------------- This SF.net email is sponsored by the 2008 JavaOne(SM) Conference Don't miss this year's exciting event. There's still time to save $100. Use priority code J8TL2D2. http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone

[511] web/htdocs/links.php

2008-02-24T20:45:16

Revision: 511 http://pel.svn.sourceforge.net/pel/?rev=511&view=rev Author: mgeisler Date: 2008-02-24 12:45:15 -0800 (Sun, 24 Feb 2008) Log Message: ----------- Added link to PEAR channel. Modified Paths: -------------- web/htdocs/links.php Modified: web/htdocs/links.php =================================================================== --- web/htdocs/links.php2008-01-17 18:40:22 UTC (rev 510) +++ web/htdocs/links.php2008-02-24 20:45:15 UTC (rev 511) < at >< at > -50,6 +50,10 < at >< at >

PEAR channel at pear.sharedlog.com, maintained by Dmitri.

+ +

The Exif specification from EXIF.org.

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ------------------------------------------------------------------------- This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2008. http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/

[510] trunk/PelIfd.php

2008-01-17T18:40:22

Revision: 510 http://pel.svn.sourceforge.net/pel/?rev=510&view=rev Author: mgeisler Date: 2008-01-17 10:40:22 -0800 (Thu, 17 Jan 2008) Log Message: ----------- Throw an exception in addEntry() if the entry does not belong to the IFD as per the isValidTag() method. Modified Paths: -------------- trunk/PelIfd.php Modified: trunk/PelIfd.php =================================================================== --- trunk/PelIfd.php2007-10-25 15:28:15 UTC (rev 509) +++ trunk/PelIfd.php2008-01-17 18:40:22 UTC (rev 510) < at >< at > -3,7 +3,7 < at >< at > /* PEL: PHP Exif Library. A library with support for reading and * writing all Exif headers in JPEG and TIFF images using PHP. * - * Copyright (C) 2004, 2005, 2006, 2007 Martin Geisler. + * Copyright (C) 2004, 2005, 2006, 2007, 2008 Martin Geisler. * * 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 < at >< at > -267,18 +267,13 < at >< at > } try { - $entry = $this->newEntryFromData($tag, $format, $components, $data); - if ($this->isValidTag($tag)) - $this->addEntry($entry); - else - Pel::maybeThrow(new PelInvalidDataException("IFD %s cannot hold\n%s", - $this->getName(), - $entry->__toString())); - } catch (PelException $e) { - /* Throw the exception when running in strict mode, store - * otherwise. */ - Pel::maybeThrow($e); - } + $entry = $this->newEntryFromData($tag, $format, $components, $data); + $this->addEntry($entry); + } catch (PelException $e) { + /* Throw the exception when running in strict mode, store + * otherwise. */ + Pel::maybeThrow($e); + } /* The format of the thumbnail is stored in this tag. */ // TODO: handle TIFF thumbnail. < at >< at > -793,15 +788,22 < at >< at > /** * Adds an entry to the directory. * - * < at >param PelEntry the entry that will be added. + * < at >param PelEntry the entry that will be added. If the entry is not + * valid in this IFD (as per {< at >link isValidTag()}) an + * {< at >link PelInvalidDataException} is thrown. * * < at >todo The entry will be identified with its tag, so each * directory can only contain one entry with each tag. Is this a * bug? */ function addEntry(PelEntry $e) { - $e->setIfdType($this->type); - $this->entries[$e->getTag()] = $e; + if ($this->isValidTag($e->getTag())) { + $e->setIfdType($this->type); + $this->entries[$e->getTag()] = $e; + } else { + throw new PelInvalidDataException("IFD %s cannot hold\n%s", + $this->getName(), $e->__toString()); + } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ------------------------------------------------------------------------- This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2008. http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/

[509] trunk

2007-10-25T15:28:16

Revision: 509 http://pel.svn.sourceforge.net/pel/?rev=509&view=rev Author: mgeisler Date: 2007-10-25 08:28:15 -0700 (Thu, 25 Oct 2007) Log Message: ----------- Added GPS example. Modified Paths: -------------- trunk/NEWS Added Paths: ----------- trunk/examples/gps.php Modified: trunk/NEWS =================================================================== --- trunk/NEWS2007-10-21 19:44:41 UTC (rev 508) +++ trunk/NEWS2007-10-25 15:28:15 UTC (rev 509) < at >< at > -13,10 +13,14 < at >< at > Added a static method, Pel::setJPEGQuality(), for controlling the quality for encoding JPEG images. Fixed bug in conversion between Julian Day count and UNIX timestamps and removed dependency on the -calendar PHP extension. Fixed placement of Windows XP tags. +calendar PHP extension. Fixed placement of Windows XP tags. Added GPS +example. Changes: +* Added an example of how GPS information can be added. Thanks Andac + Aydin for contributing and testing this. + * Fixed PelJpegComment::getBytes(): it didn't return anything! Thanks macondos. Added: trunk/examples/gps.php =================================================================== --- trunk/examples/gps.php (rev 0) +++ trunk/examples/gps.php2007-10-25 15:28:15 UTC (rev 509) < at >< at > -0,0 +1,180 < at >< at > +gmx.de). + * + * This example shows how one can add GPS information to a JPEG image. + * Any Exif information in the image will be overwritten by the new + * information. + * + * This example includes two functions: + * + * - convertDecimalTpDMS() converts decimal GPS coordinates (how you use them + * in Google Maps for example) to the conventional coordinate-system + * used in Exif data. + * + * - addGpsInfo() adds several Exif tags to your JPEG file. + */ + +error_reporting(E_ALL); + +require_once(dirname(__FILE__) . '/../PelJpeg.php'); + +/** + * Convert a decimal degree into degrees, minutes, and seconds. + * + * < at >param int the degree in the form 123.456. Must be in the interval + * [-180, 180]. + * + * < at >return array a triple with the degrees, minutes, and seconds. Each + * value is an array itself, suitable for passing to a + * PelEntryRational. If the degree is outside the allowed interval, + * null is returned instead. + */ +function convertDecimalToDMS($degree) { + if ($degree > 180 || $degree < -180) + return null; + + $degree = abs($degree); // make sure number is positive + // (no distinction here for N/S + // or W/E). + + $seconds = $degree * 3600; // Total number of seconds. + + $degrees = floor($degree); // Number of whole degrees. + $seconds -= $degrees * 3600; // Subtract the number of seconds + // taken by the degrees. + + $minutes = floor($seconds / 60); // Number of whole minutes. + $seconds -= $minutes * 60; // Subtract the number of seconds + // taken by the minutes. + + $seconds = round($seconds*100, 0); // Round seconds with a 1/100th + // second precision. + + return array(array($degrees, 1), array($minutes, 1), array($seconds, 100)); +} + +/** + * Add GPS information to an image basic metadata. Any old Exif data + * is discarded. + * + * < at >param string the input filename. + * + * < at >param string the output filename. An updated copy of the input + * image is saved here. + * + * < at >param string image description. + * + * < at >param string user comment. + * + * < at >param string camera model. + * + * < at >param float longitude expressed as a fractional number of degrees, + * e.g. 12.345\xB0. Negative values denotes degrees west of Greenwich. + * + * < at >param float latitude expressed as for longitude. Negative values + * denote degrees south of equator. + * + * < at >param float the altitude, negative values express an altitude + * below sea level. + * + * < at >param string the date and time. + */ +function addGpsInfo($input, $output, $description, $comment, $model, + $longitude, $latitude, $altitude, $date_time) { + /* Load the given image into a PelJpeg object */ + $jpeg = new PelJpeg($input); + + /* Create and add empty Exif data to the image (this throws away any + * old Exif data in the image). */ + $exif = new PelExif(); + $jpeg->setExif($exif); + + /* Create and add TIFF data to the Exif data (Exif data is actually + * stored in a TIFF format). */ + $tiff = new PelTiff(); + $exif->setTiff($tiff); + + /* Create first Image File Directory and associate it with the TIFF + * data. */ + $ifd0 = new PelIfd(PelIfd::IFD0); + $tiff->setIfd($ifd0); + + /* Create a sub-IFD for holding GPS information. GPS data must be + * below the first IFD. */ + $gps_ifd = new PelIfd(PelIfd::GPS); + $ifd0->addSubIfd($gps_ifd); + + /* The USER_COMMENT tag must be put in a Exif sub-IFD under the + * first IFD. */ + $exif_ifd = new PelIfd(PelIfd::EXIF); + $exif_ifd->addEntry(new PelEntryUserComment($comment)); + $ifd0->addSubIfd($exif_ifd); + + $inter_ifd = new PelIfd(PelIfd::INTEROPERABILITY); + $ifd0->addSubIfd($inter_ifd); + + $ifd0->addEntry(new PelEntryAscii(PelTag::MODEL, $model)); + $ifd0->addEntry(new PelEntryAscii(PelTag::DATE_TIME, $date_time)); + $ifd0->addEntry(new PelEntryAscii(PelTag::IMAGE_DESCRIPTION, $description)); + + $gps_ifd->addEntry(new PelEntryByte(PelTag::GPS_VERSION_ID, 2, 2, 0, 0)); + + /* Use the convertDecimalToDMS function to convert the latitude from + * something like 12.34\xB0 to 12\xB0 20' 42" */ + list($hours, $minutes, $seconds) = convertDecimalToDMS($latitude); + + /* We interpret a negative latitude as being south. */ + $latitude_ref = ($latitude < 0) ? 'S' : 'N'; + + $gps_ifd->addEntry(new PelEntryAscii(PelTag::GPS_LATITUDE_REF, + $latitude_ref)); + $gps_ifd->addEntry(new PelEntryRational(PelTag::GPS_LATITUDE, + $hours, $minutes, $seconds)); + + /* The longitude works like the latitude. */ + list($hours, $minutes, $seconds) = convertDecimalToDMS($longitude); + $longitude_ref = ($longitude < 0) ? 'W' : 'E'; + + $gps_ifd->addEntry(new PelEntryAscii(PelTag::GPS_LONGITUDE_REF, + $longitude_ref)); + $gps_ifd->addEntry(new PelEntryRational(PelTag::GPS_LONGITUDE, + $hours, $minutes, $seconds)); + + /* Add the altitude. The absolute value is stored here, the sign is + * stored in the GPS_ALTITUDE_REF tag below. */ + $gps_ifd->addEntry(new PelEntryRational(PelTag::GPS_ALTITUDE, + array(abs($altitude), 1))); + /* The reference is set to 1 (true) if the altitude is below sea + * level, or 0 (false) otherwise. */ + $gps_ifd->addEntry(new PelEntryByte(PelTag::GPS_ALTITUDE_REF, + (int)($altitude < 0))); + + /* Finally we store the data in the output file. */ + file_put_contents($output, $jpeg->getBytes()); +} + +?> \ No newline at end of file Property changes on: trunk/examples/gps.php ___________________________________________________________________ Name: svn:keywords + Revision Date Author Id This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ------------------------------------------------------------------------- This SF.net email is sponsored by: Splunk Inc. Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now >> http://get.splunk.com/

[508] trunk/PelIfd.php

2007-10-21T19:44:41

Revision: 508 http://pel.svn.sourceforge.net/pel/?rev=508&view=rev Author: mgeisler Date: 2007-10-21 12:44:41 -0700 (Sun, 21 Oct 2007) Log Message: ----------- Make sure to set the IFD type on all entries added. Modified Paths: -------------- trunk/PelIfd.php Modified: trunk/PelIfd.php =================================================================== --- trunk/PelIfd.php2007-06-17 17:02:40 UTC (rev 507) +++ trunk/PelIfd.php2007-10-21 19:44:41 UTC (rev 508) < at >< at > -268,15 +268,12 < at >< at > try { $entry = $this->newEntryFromData($tag, $format, $components, $data); - - if ($this->isValidTag($tag)) { - $entry->setIfdType($this->type); - $this->entries[$tag] = $entry; - } else { + if ($this->isValidTag($tag)) + $this->addEntry($entry); + else Pel::maybeThrow(new PelInvalidDataException("IFD %s cannot hold\n%s", $this->getName(), $entry->__toString())); - } } catch (PelException $e) { /* Throw the exception when running in strict mode, store * otherwise. */ < at >< at > -803,6 +800,7 < at >< at > * bug? */ function addEntry(PelEntry $e) { + $e->setIfdType($this->type); $this->entries[$e->getTag()] = $e; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ------------------------------------------------------------------------- This SF.net email is sponsored by: Splunk Inc. Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now >> http://get.splunk.com/

[507] trunk/makepackagexml.php

2007-06-17T17:02:40

Revision: 507 http://svn.sourceforge.net/pel/?rev=507&view=rev Author: lsolesen Date: 2007-06-17 10:02:40 -0700 (Sun, 17 Jun 2007) Log Message: ----------- Changed the stated license from LGPL to GPL as Martin wrote on pel-devel. Modified Paths: -------------- trunk/makepackagexml.php Modified: trunk/makepackagexml.php =================================================================== --- trunk/makepackagexml.php2007-06-11 17:06:26 UTC (rev 506) +++ trunk/makepackagexml.php2007-06-17 17:02:40 UTC (rev 507) < at >< at > -62,7 +62,7 < at >< at > Using PEL, one can fully modify the Exif data, meaning that it can be both read and written. Completely new Exif data can also be added to images. PEL is written completely in PHP and depends on nothing except a standard installation of PHP, version 5. PEL is hosted on SourceForge.'); $pfm->setUri($url); -$pfm->setLicense('LGPL License', 'http://www.gnu.org/licenses/lgpl.html'); +$pfm->setLicense('GPL License', 'http://www.gnu.org/licenses/gpl.html'); $pfm->addMaintainer('lead', 'mgeisler', 'Martin Geisler', 'mgeisler< at >mgeisler.net'); $pfm->addMaintainer('helper', 'lsolesen', 'Lars Olesen', 'lars< at >legestue.net'); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ------------------------------------------------------------------------- This SF.net email is sponsored by DB2 Express Download DB2 Express C - the FREE version of DB2 express and take control of your XML. No limits. Just data. Click to get it now. http://sourceforge.net/powerbar/db2/

[506] trunk/makepackagexml.php

2007-06-11T17:06:26

Revision: 506 http://svn.sourceforge.net/pel/?rev=506&view=rev Author: lsolesen Date: 2007-06-11 10:06:26 -0700 (Mon, 11 Jun 2007) Log Message: ----------- Added a php script to generate a package.xml file which can be used to create a PEAR package. Added Paths: ----------- trunk/makepackagexml.php Added: trunk/makepackagexml.php =================================================================== --- trunk/makepackagexml.php (rev 0) +++ trunk/makepackagexml.php2007-06-11 17:06:26 UTC (rev 506) < at >< at > -0,0 +1,91 < at >< at > + + * $ php makepackagexml.php make + * $ pear package package.xml + * + * + * < at >package PEL + * < at >author Lars Olesen legestue.net> + * < at >version < at >package-version< at > + * < at >license http://www.gnu.org/licenses/gpl.html GNU General Public + */ + +require_once 'PEAR/PackageFileManager2.php'; + +$version = '0.9.2'; +$stability = 'beta'; +$notes = '* initial release as a PEAR package'; +$url = 'http://downloads.sf.net/pel/PEL-' . $version . '.tgz'; + +PEAR::setErrorHandling(PEAR_ERROR_DIE); +$pfm = new PEAR_PackageFileManager2(); +$pfm->setOptions( + array( + 'baseinstalldir' => 'PEL', + 'filelistgenerator' => 'file', + 'packagedirectory' => dirname(__FILE__), + 'packagefile' => 'package.xml', + 'ignore' => array( + 'makepackagexml.php', + '*.tgz', + '*.sh', + 'test/', + 'tutorials/', + 'authors.xml' + ), + 'dir_roles' => array( + 'doc' => 'doc', + 'examples' => 'doc', + 'test' => 'test' + ), + 'exceptions' => array( + 'README' => 'doc', + 'AUTHORS' => 'doc', + 'COPYING' => 'doc', + 'INSTALL' => 'doc', + 'NEWS' => 'doc', + 'TODO' => 'doc' + ), + 'simpleoutput' => true, + ) +); + +$pfm->setPackage('PEL'); +$pfm->setSummary('The PHP Exif Library (PEL) lets you fully manipulate Exif (Exchangeable Image File Format) data.'); +$pfm->setDescription('The PHP Exif Library (PEL) lets you fully manipulate Exif (Exchangeable Image File Format) data. This is the data that digital cameras place in their images, such as the date and time, shutter speed, ISO value and so on. + +Using PEL, one can fully modify the Exif data, meaning that it can be both read and written. Completely new Exif data can also be added to images. PEL is written completely in PHP and depends on nothing except a standard installation of PHP, version 5. PEL is hosted on SourceForge.'); +$pfm->setUri($url); +$pfm->setLicense('LGPL License', 'http://www.gnu.org/licenses/lgpl.html'); +$pfm->addMaintainer('lead', 'mgeisler', 'Martin Geisler', 'mgeisler< at >mgeisler.net'); +$pfm->addMaintainer('helper', 'lsolesen', 'Lars Olesen', 'lars< at >legestue.net'); + +$pfm->setPackageType('php'); + +$pfm->setAPIVersion($version); +$pfm->setReleaseVersion($version); +$pfm->setAPIStability($stability); +$pfm->setReleaseStability($stability); +$pfm->setNotes($notes); +$pfm->addRelease(); + +$pfm->clearDeps(); +$pfm->setPhpDep('5.0.0'); +$pfm->setPearinstallerDep('1.5.0'); + +$pfm->generateContents(); + +if (isset($_GET['make']) || (isset($_SERVER['argv']) && < at >$_SERVER['argv'][1] == 'make')) { + if ($pfm->writePackageFile()) { + exit('package created'); + } +} else { + $pfm->debugPackageFile(); +} +?> \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ------------------------------------------------------------------------- This SF.net email is sponsored by DB2 Express Download DB2 Express C - the FREE version of DB2 express and take control of your XML. No limits. Just data. Click to get it now. http://sourceforge.net/powerbar/db2/

[505] trunk/tutorials/PEL/using.pkg

2007-06-06T20:09:51

Revision: 505 http://svn.sourceforge.net/pel/?rev=505&view=rev Author: mgeisler Date: 2007-06-06 13:09:51 -0700 (Wed, 06 Jun 2007) Log Message: ----------- Found another example that should use saveFile(). Modified Paths: -------------- trunk/tutorials/PEL/using.pkg Modified: trunk/tutorials/PEL/using.pkg =================================================================== --- trunk/tutorials/PEL/using.pkg2007-06-06 20:07:57 UTC (rev 504) +++ trunk/tutorials/PEL/using.pkg2007-06-06 20:09:51 UTC (rev 505) < at >< at > -167,7 +167,7 < at >< at > getBytes()); +$jpeg->saveFile('new-' . $filename); ]]> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ------------------------------------------------------------------------- This SF.net email is sponsored by DB2 Express Download DB2 Express C - the FREE version of DB2 express and take control of your XML. No limits. Just data. Click to get it now. http://sourceforge.net/powerbar/db2/

[504] trunk

2007-06-06T20:07:58

Revision: 504 http://svn.sourceforge.net/pel/?rev=504&view=rev Author: mgeisler Date: 2007-06-06 13:07:57 -0700 (Wed, 06 Jun 2007) Log Message: ----------- Introduced a new PelJpeg convenience method: saveFile(), which does what it says it does. Suggested by Lars Olesen, thanks. Modified Paths: -------------- trunk/INSTALL trunk/PelJpeg.php trunk/examples/edit-description.php trunk/examples/resize.php trunk/test/image-tests/read-write.php Modified: trunk/INSTALL =================================================================== --- trunk/INSTALL2007-04-28 09:47:51 UTC (rev 503) +++ trunk/INSTALL2007-06-06 20:07:57 UTC (rev 504) < at >< at > -1,7 +1,7 < at >< at > INSTALL file for PEL: PHP Exif Library. A library with support for reading and writing Exif headers in JPEG and TIFF images using PHP. -Copyright (C) 2004, 2005, 2006 Martin Geisler. +Copyright (C) 2004, 2005, 2006, 2007 Martin Geisler. Licensed under the GNU GPL, see COPYING for details. < at >< at > -65,11 +65,10 < at >< at > require_once('PelJpeg.php'); $jpeg = new PelJpeg($argv[1]); - $ifd0 = $jpeg->getExif()->getTiff()->getIfd(); $entry = $ifd0->getEntry(PelTag::IMAGE_DESCRIPTION); $entry->setValue('Edited by PEL'); - file_put_contents($argv[1], $jpeg->getBytes()); + $jpeg->saveFile($argv[1]); ?> See the examples directory for this example (or rather a more Modified: trunk/PelJpeg.php =================================================================== --- trunk/PelJpeg.php2007-04-28 09:47:51 UTC (rev 503) +++ trunk/PelJpeg.php2007-06-06 20:07:57 UTC (rev 504) < at >< at > -3,7 +3,7 < at >< at > /* PEL: PHP Exif Library. A library with support for reading and * writing all Exif headers in JPEG and TIFF images using PHP. * - * Copyright (C) 2004, 2005, 2006 Martin Geisler. + * Copyright (C) 2004, 2005, 2006, 2007 Martin Geisler. * * 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 < at >< at > -496,7 +496,8 < at >< at > * Turn this JPEG object into bytes. * * The bytes returned by this method is ready to be stored in a file - * as a valid JPEG image. + * as a valid JPEG image. Use the {< at >link saveFile()} convenience + * method to do this. * * < at >return string bytes representing this JPEG object, including all * its sections and their associated data. < at >< at > -531,6 +532,17 < at >< at > /** + * Save the JPEG object as a JPEG image in a file. + * + * < at >param string the filename to save in. An existing file with the + * same name will be overwritten! + */ + function saveFile($filename) { + file_put_contents($filename, $this->getBytes()); + } + + + /** * Make a string representation of this JPEG object. * * This is mainly usefull for debugging. It will show the structure Modified: trunk/examples/edit-description.php =================================================================== --- trunk/examples/edit-description.php2007-04-28 09:47:51 UTC (rev 503) +++ trunk/examples/edit-description.php2007-06-06 20:07:57 UTC (rev 504) < at >< at > -4,7 +4,7 < at >< at > /* PEL: PHP Exif Library. A library with support for reading and * writing all Exif headers in JPEG and TIFF images using PHP. * - * Copyright (C) 2004, 2005, 2006 Martin Geisler. + * Copyright (C) 2004, 2005, 2006, 2007 Martin Geisler. * * 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 < at >< at > -205,7 +205,7 < at >< at > * bytes with the getBytes method, and saving this in the output file * completes the script. */ println('Writing file "%s".', $output); -file_put_contents($output, $file->getBytes()); +$file->saveFile($output); /* The End. */ ?> \ No newline at end of file Modified: trunk/examples/resize.php =================================================================== --- trunk/examples/resize.php2007-04-28 09:47:51 UTC (rev 503) +++ trunk/examples/resize.php2007-06-06 20:07:57 UTC (rev 504) < at >< at > -4,7 +4,7 < at >< at > /* PEL: PHP Exif Library. A library with support for reading and * writing all Exif headers in JPEG and TIFF images using PHP. * - * Copyright (C) 2006 Martin Geisler. + * Copyright (C) 2006, 2007 Martin Geisler. * * 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 < at >< at > -124,7 +124,7 < at >< at > /* We can now save the scaled image. */ println('Writing file "%s".', $output); -file_put_contents($output, $output_jpeg->getBytes()); +$output_jpeg->saveFile($output); /* The End. */ ?> \ No newline at end of file Modified: trunk/test/image-tests/read-write.php =================================================================== --- trunk/test/image-tests/read-write.php2007-04-28 09:47:51 UTC (rev 503) +++ trunk/test/image-tests/read-write.php2007-06-06 20:07:57 UTC (rev 504) < at >< at > -3,7 +3,7 < at >< at > /* PEL: PHP Exif Library. A library with support for reading and * writing all Exif headers in JPEG and TIFF images using PHP. * - * Copyright (C) 2004, 2006 Martin Geisler. + * Copyright (C) 2004, 2006, 2007 Martin Geisler. * * 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 < at >< at > -48,19 +48,16 < at >< at > $exif->setTiff($tiff); $this->assertNotNull($exif->getTiff()); - $jpeg = new PelJpeg(dirname(__FILE__) . '/no-exif.jpg'); - $this->assertNull($jpeg->getExif()); $jpeg->setExif($exif); $this->assertNotNull($jpeg->getExif()); - file_put_contents('test-output.jpg', $jpeg->getBytes()); + $jpeg->saveFile('test-output.jpg'); $this->assertTrue(file_exists('test-output.jpg')); $this->assertTrue(filesize('test-output.jpg') > 0); /* Now read the file and see if the entries are still there. */ - $jpeg = new PelJpeg('test-output.jpg'); $exif = $jpeg->getExif(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ------------------------------------------------------------------------- This SF.net email is sponsored by DB2 Express Download DB2 Express C - the FREE version of DB2 express and take control of your XML. No limits. Just data. Click to get it now. http://sourceforge.net/powerbar/db2/

[503] trunk

2007-04-28T09:47:52

Revision: 503 http://svn.sourceforge.net/pel/?rev=503&view=rev Author: mgeisler Date: 2007-04-28 02:47:51 -0700 (Sat, 28 Apr 2007) Log Message: ----------- Fixed getBytes() so that it returns... Thanks macondos. Modified Paths: -------------- trunk/NEWS trunk/PelJpegComment.php Modified: trunk/NEWS =================================================================== --- trunk/NEWS2007-04-24 18:52:22 UTC (rev 502) +++ trunk/NEWS2007-04-28 09:47:51 UTC (rev 503) < at >< at > -17,6 +17,9 < at >< at > Changes: +* Fixed PelJpegComment::getBytes(): it didn't return anything! Thanks + macondos. + * Fixed SF bug #1699489: Incorrect UNIX/Julian conversion. * PEL 0.9.1 introduced a dependency on the calendar extension for PHP. Modified: trunk/PelJpegComment.php =================================================================== --- trunk/PelJpegComment.php2007-04-24 18:52:22 UTC (rev 502) +++ trunk/PelJpegComment.php2007-04-28 09:47:51 UTC (rev 503) < at >< at > -3,7 +3,7 < at >< at > /* PEL: PHP Exif Library. A library with support for reading and * writing all Exif headers in JPEG and TIFF images using PHP. * - * Copyright (C) 2005 Martin Geisler. + * Copyright (C) 2005, 2007 Martin Geisler. * * 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 < at >< at > -103,7 +103,7 < at >< at > * < at >return string bytes representing this comment. */ function getBytes() { - $this->comment; + return $this->comment; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ------------------------------------------------------------------------- This SF.net email is sponsored by DB2 Express Download DB2 Express C - the FREE version of DB2 express and take control of your XML. No limits. Just data. Click to get it now. http://sourceforge.net/powerbar/db2/

[502] trunk

2007-04-24T18:52:22

Revision: 502 http://svn.sourceforge.net/pel/?rev=502&view=rev Author: mgeisler Date: 2007-04-24 11:52:22 -0700 (Tue, 24 Apr 2007) Log Message: ----------- Fixed SF bug #1699489. Modified Paths: -------------- trunk/NEWS trunk/PelEntryAscii.php trunk/test/ascii.php Modified: trunk/NEWS =================================================================== --- trunk/NEWS2007-04-22 22:41:59 UTC (rev 501) +++ trunk/NEWS2007-04-24 18:52:22 UTC (rev 502) < at >< at > -11,15 +11,18 < at >< at > Notes: Added a static method, Pel::setJPEGQuality(), for controlling the -quality for encoding JPEG images. Enabled work around in case PHP -lacks the calendar extension. Fixed placement of Windows XP tags. +quality for encoding JPEG images. Fixed bug in conversion between +Julian Day count and UNIX timestamps and removed dependency on the +calendar PHP extension. Fixed placement of Windows XP tags. Changes: -* If PHP was compiled without the calendar extension, we now enable - pure-PHP implementations of the necessary functions. The patch was - supplied by Fran\xE7ois Pirsch, thanks. +* Fixed SF bug #1699489: Incorrect UNIX/Julian conversion. +* PEL 0.9.1 introduced a dependency on the calendar extension for PHP. + The necessary functions have now been reimplemented in pure PHP. The + patch was supplied by Fran\xE7ois Pirsch, thanks. + * Fixed doc comment for PelEntryTime, the variables for date() was swapped. Thanks Fran\xE7ois Pirsch. Modified: trunk/PelEntryAscii.php =================================================================== --- trunk/PelEntryAscii.php2007-04-22 22:41:59 UTC (rev 501) +++ trunk/PelEntryAscii.php2007-04-24 18:52:22 UTC (rev 502) < at >< at > -92,7 +92,7 < at >< at > function __construct($tag, $str = '') { $this->tag = $tag; $this->format = PelFormat::ASCII; - $this->setValue($str); + self::setValue($str); } < at >< at > -145,54 +145,6 < at >< at > } -/* - * The PelEntryTime class below uses the calendar extension, but if - * that is not available we can enumate the functions we need. - * - * Reference: http://www.hermetic.ch/cal_stud/jdn.htm#comp - */ - -if (!function_exists('gregoriantojd')) { - // The Julian day number of 1/1/1970 is 2440588. - function gregoriantojd($month, $day, $year){ - $m1412 = ($month <= 2) ? -1 : 0; - return floor(( 1461 * ( $year + 4800 + $m1412 ) ) / 4) + - floor(( 367 * ( $month - 2 - 12 * $m1412 ) ) / 12) - - floor(( 3 * floor( ( $year + 4900 + $m1412 ) / 100 ) ) / 4) + - $day - 32075; - } -} - -if (!function_exists('unixtojd')){ - function unixtojd($timestamp){ - $unix_day = floor($timestamp / 86400); - return $unix_day + 2440588; - } -} - -if (!function_exists('jdtounix')) { - function jdtounix($jday){ - return ($jday - 2440588) * 86400; - } -} - -if (!function_exists('jdtogregorian')) { - function jdtogregorian($jd){ - $l = $jd + 68569; - $n = floor(( 4 * $l ) / 146097); - $l = $l - floor(( 146097 * $n + 3 ) / 4); - $i = floor(( 4000 * ( $l + 1 ) ) / 1461001); - $l = $l - floor(( 1461 * $i ) / 4) + 31; - $j = floor(( 80 * $l ) / 2447); - $d = $l - floor(( 2447 * $j ) / 80); - $l = floor($j / 11); - $m = $j + 2 - ( 12 * $l ); - $y = 100 * ( $n - 49 ) + $i + $l; - return "$m/$d/$y"; - } -} - - /** * Class for holding a date and time. * < at >< at > -306,16 +258,16 < at >< at > function getValue($type = self::UNIX_TIMESTAMP) { switch ($type) { case self::UNIX_TIMESTAMP: - $seconds = jdtounix($this->day_count); + $seconds = $this->convertJdToUnix($this->day_count); if ($seconds === false) - /* jdtounix() return false if the Julian Day Count is outside - * the range of a UNIX timestamp. */ + /* We get false if the Julian Day Count is outside the range + * of a UNIX timestamp. */ return false; else return $seconds + $this->seconds; case self::EXIF_STRING: - list($month, $day, $year) = explode('/', jdtogregorian($this->day_count)); + list($year, $month, $day) = $this->convertJdToGregorian($this->day_count); $hours = (int)($this->seconds / 3600); $minutes = (int)($this->seconds % 3600 / 60); $seconds = $this->seconds % 60; < at >< at > -332,7 +284,7 < at >< at > self::EXIF_STRING, self::JULIAN_DAY_COUNT, $type); - } + } } < at >< at > -351,14 +303,14 < at >< at > * < at >param int the type of the timestamp. This must be one of * {< at >link UNIX_TIMESTAMP}, {< at >link EXIF_STRING}, or * {< at >link JULIAN_DAY_COUNT}. - * - * < at >todo How to deal with timezones? Use the TimeZoneOffset tag - * 0x882A? */ function setValue($timestamp, $type = self::UNIX_TIMESTAMP) { + #if (empty($timestamp)) + # debug_print_backtrace(); + switch ($type) { case self::UNIX_TIMESTAMP: - $this->day_count = unixtojd($timestamp); + $this->day_count = $this->convertUnixToJd($timestamp); $this->seconds = $timestamp % 86400; break; < at >< at > -366,7 +318,7 < at >< at > /* Clean the timestamp: some timestamps are broken other * separators than ':' and ' '. */ $d = split('[^0-9]+', $timestamp); - $this->day_count = gregoriantojd($d[1], $d[2], $d[0]); + $this->day_count = $this->convertGregorianToJd($d[0], $d[1], $d[2]); $this->seconds = $d[3]*3600 + $d[4]*60 + $d[5]; break; < at >< at > -390,6 +342,85 < at >< at > * turned into bytes. */ parent::setValue($this->getValue(self::EXIF_STRING)); } + + + // The following four functions are used for converting back and + // forth between the date formats. They are used in preference to + // the ones from the PHP calendar extension to avoid having to + // fiddle with timezones and to avoid depending on the extension. + // + // See http://www.hermetic.ch/cal_stud/jdn.htm#comp for a reference. + + /** + * Converts a date in year/month/day format to a Julian Day count. + * + * < at >param int $year the year. + * < at >param int $month the month, 1 to 12. + * < at >param int $day the day in the month. + * < at >return int the Julian Day count. + */ + function convertGregorianToJd($year, $month, $day) { + // Special case mapping 0/0/0 -> 0 + if ($year == 0 || $month == 0 || $day == 0) + return 0; + + $m1412 = ($month <= 2) ? -1 : 0; + return floor(( 1461 * ( $year + 4800 + $m1412 ) ) / 4) + + floor(( 367 * ( $month - 2 - 12 * $m1412 ) ) / 12) - + floor(( 3 * floor( ( $year + 4900 + $m1412 ) / 100 ) ) / 4) + + $day - 32075; + } + + /** + * Converts a Julian Day count to a year/month/day triple. + * + * < at >param int the Julian Day count. + * < at >return array an array with three entries: year, month, day. + */ + function convertJdToGregorian($jd) { + // Special case mapping 0 -> 0/0/0 + if ($jd == 0) + return array(0,0,0); + + $l = $jd + 68569; + $n = floor(( 4 * $l ) / 146097); + $l = $l - floor(( 146097 * $n + 3 ) / 4); + $i = floor(( 4000 * ( $l + 1 ) ) / 1461001); + $l = $l - floor(( 1461 * $i ) / 4) + 31; + $j = floor(( 80 * $l ) / 2447); + $d = $l - floor(( 2447 * $j ) / 80); + $l = floor($j / 11); + $m = $j + 2 - ( 12 * $l ); + $y = 100 * ( $n - 49 ) + $i + $l; + return array($y, $m, $d); + } + + /** + * Converts a UNIX timestamp to a Julian Day count. + * + * < at >param int $timestamp the timestamp. + * < at >return int the Julian Day count. + */ + function convertUnixToJd($timestamp) { + return (int)(floor($timestamp / 86400) + 2440588); + } + + /** + * Converts a Julian Day count to a UNIX timestamp. + * + * < at >param int $jd the Julian Day count. + + * < at >return mixed $timestamp the integer timestamp or false if the + * day count cannot be represented as a UNIX timestamp. + */ + function convertJdToUnix($jd) { + $timestamp = ($jd - 2440588) * 86400; + if ($timestamp != (int)$timestamp) + return false; + else + return $timestamp; + } + } Modified: trunk/test/ascii.php =================================================================== --- trunk/test/ascii.php2007-04-22 22:41:59 UTC (rev 501) +++ trunk/test/ascii.php2007-04-24 18:52:22 UTC (rev 502) < at >< at > -3,7 +3,7 < at >< at > /* PEL: PHP Exif Library. A library with support for reading and * writing all Exif headers in JPEG and TIFF images using PHP. * - * Copyright (C) 2004, 2006 Martin Geisler. + * Copyright (C) 2004, 2006, 2007 Martin Geisler. * * 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 < at >< at > -101,6 +101,14 < at >< at > '9999:12:31 23:59:59'); $this->assertEqual($entry->getValue(PelEntryTime::JULIAN_DAY_COUNT), 5373484 + 86399/86400); + + // Check day roll-over for SF bug #1699489. + $entry->setValue('2007:04:23 23:30:00', PelEntryTime::EXIF_STRING); + $t = $entry->getValue(PelEntryTime::UNIX_TIMESTAMP); + $entry->setValue($t + 3600); + + $this->assertEqual($entry->getValue(PelEntryTime::EXIF_STRING), + '2007:04:24 00:30:00'); } function testCopyright() { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ------------------------------------------------------------------------- This SF.net email is sponsored by DB2 Express Download DB2 Express C - the FREE version of DB2 express and take control of your XML. No limits. Just data. Click to get it now. http://sourceforge.net/powerbar/db2/

[501] trunk

2007-04-22T22:42:00

Revision: 501 http://svn.sourceforge.net/pel/?rev=501&view=rev Author: mgeisler Date: 2007-04-22 15:41:59 -0700 (Sun, 22 Apr 2007) Log Message: ----------- Patch by Fran?\195?\167ois Pirsch which implements PHP work arounds for the calendar functions we use. Modified Paths: -------------- trunk/NEWS trunk/PelEntryAscii.php Modified: trunk/NEWS =================================================================== --- trunk/NEWS2007-03-24 19:49:11 UTC (rev 500) +++ trunk/NEWS2007-04-22 22:41:59 UTC (rev 501) < at >< at > -10,13 +10,21 < at >< at > Notes: -Added static method for controlling the quality for encoding JPEG -images. Fixed placement of Windows XP tags. +Added a static method, Pel::setJPEGQuality(), for controlling the +quality for encoding JPEG images. Enabled work around in case PHP +lacks the calendar extension. Fixed placement of Windows XP tags. Changes: +* If PHP was compiled without the calendar extension, we now enable + pure-PHP implementations of the necessary functions. The patch was + supplied by Fran\xE7ois Pirsch, thanks. + +* Fixed doc comment for PelEntryTime, the variables for date() was + swapped. Thanks Fran\xE7ois Pirsch. + * Added static Pel::setJPEGQuality() and Pel::getJPEGQuality() method - for setting and getting the quailty used when PelJpeg automatically + for setting and getting the quality used when PelJpeg automatically converts an image resource to a JPEG image. Thanks Csaba Gabor for asking about this. Modified: trunk/PelEntryAscii.php =================================================================== --- trunk/PelEntryAscii.php2007-03-24 19:49:11 UTC (rev 500) +++ trunk/PelEntryAscii.php2007-04-22 22:41:59 UTC (rev 501) < at >< at > -3,7 +3,7 < at >< at > /* PEL: PHP Exif Library. A library with support for reading and * writing all Exif headers in JPEG and TIFF images using PHP. * - * Copyright (C) 2004, 2005, 2006 Martin Geisler. + * Copyright (C) 2004, 2005, 2006, 2007 Martin Geisler. * * 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 < at >< at > -145,6 +145,54 < at >< at > } +/* + * The PelEntryTime class below uses the calendar extension, but if + * that is not available we can enumate the functions we need. + * + * Reference: http://www.hermetic.ch/cal_stud/jdn.htm#comp + */ + +if (!function_exists('gregoriantojd')) { + // The Julian day number of 1/1/1970 is 2440588. + function gregoriantojd($month, $day, $year){ + $m1412 = ($month <= 2) ? -1 : 0; + return floor(( 1461 * ( $year + 4800 + $m1412 ) ) / 4) + + floor(( 367 * ( $month - 2 - 12 * $m1412 ) ) / 12) - + floor(( 3 * floor( ( $year + 4900 + $m1412 ) / 100 ) ) / 4) + + $day - 32075; + } +} + +if (!function_exists('unixtojd')){ + function unixtojd($timestamp){ + $unix_day = floor($timestamp / 86400); + return $unix_day + 2440588; + } +} + +if (!function_exists('jdtounix')) { + function jdtounix($jday){ + return ($jday - 2440588) * 86400; + } +} + +if (!function_exists('jdtogregorian')) { + function jdtogregorian($jd){ + $l = $jd + 68569; + $n = floor(( 4 * $l ) / 146097); + $l = $l - floor(( 146097 * $n + 3 ) / 4); + $i = floor(( 4000 * ( $l + 1 ) ) / 1461001); + $l = $l - floor(( 1461 * $i ) / 4) + 31; + $j = floor(( 80 * $l ) / 2447); + $d = $l - floor(( 2447 * $j ) / 80); + $l = floor($j / 11); + $m = $j + 2 - ( 12 * $l ); + $y = 100 * ( $n - 49 ) + $i + $l; + return "$m/$d/$y"; + } +} + + /** * Class for holding a date and time. * < at >< at > -153,7 +201,7 < at >< at > *


  * $entry = $ifd->getEntry(PelTag::DATE_TIME_ORIGINAL);
  * $time = $entry->getValue();
- * print('The image was taken on the ' . date($time, 'jS'));
+ * print('The image was taken on the ' . date('jS', $time));
  * $entry->setValue($time + 7 * 24 * 3600);
  *

* This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ------------------------------------------------------------------------- This SF.net email is sponsored by DB2 Express Download DB2 Express C - the FREE version of DB2 express and take control of your XML. No limits. Just data. Click to get it now. http://sourceforge.net/powerbar/db2/

[500] trunk

2007-03-24T19:49:11

Revision: 500 http://svn.sourceforge.net/pel/?rev=500&view=rev Author: mgeisler Date: 2007-03-24 12:49:11 -0700 (Sat, 24 Mar 2007) Log Message: ----------- Better documentation for the Windows XP tags. Gave more credit to people in the NEWS file. Modified Paths: -------------- trunk/NEWS trunk/PelEntryByte.php trunk/PelTag.php Modified: trunk/NEWS =================================================================== --- trunk/NEWS2007-03-10 00:18:23 UTC (rev 499) +++ trunk/NEWS2007-03-24 19:49:11 UTC (rev 500) < at >< at > -11,7 +11,7 < at >< at > Notes: Added static method for controlling the quality for encoding JPEG -images. +images. Fixed placement of Windows XP tags. Changes: < at >< at > -21,8 +21,13 < at >< at > asking about this. * Moved the XP specific tags from the Exif IFD to the IFD0/1 IFD. + Thanks Piotr Golebiowski for noticing this. +* Added links from PelTag::XP_* tags to the PelEntryWindowsString + class. Thanks Garrison Locke for indirectly pointing out the need + for this. + PEL Version 0.9.1 December 19th 2006 ************************************* Modified: trunk/PelEntryByte.php =================================================================== --- trunk/PelEntryByte.php2007-03-10 00:18:23 UTC (rev 499) +++ trunk/PelEntryByte.php2007-03-24 19:49:11 UTC (rev 500) < at >< at > -3,7 +3,7 < at >< at > /* PEL: PHP Exif Library. A library with support for reading and * writing all Exif headers in JPEG and TIFF images using PHP. * - * Copyright (C) 2004, 2005, 2006 Martin Geisler. + * Copyright (C) 2004, 2005, 2006, 2007 Martin Geisler. * * 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 < at >< at > -179,10 +179,15 < at >< at > * * This class is to be used as in *


- * $entry = $ifd->getEntry(PelTag::XP_TITLE);
- * print($entry->getValue());
- * $entry->setValue('My favorite cat');
+ * $title = $ifd->getEntry(PelTag::XP_TITLE);
+ * print($title->getValue());
+ * $title->setValue('My favorite cat');
  *

+ * or if no entry is present one can add a new one with + *


+ * $title = new PelEntryWindowsString(PelTag::XP_TITLE, 'A cute dog.');
+ * $ifd->addEntry($title);
+ *

* * < at >author Martin Geisler users.sourceforge.net> * < at >package PEL Modified: trunk/PelTag.php =================================================================== --- trunk/PelTag.php2007-03-10 00:18:23 UTC (rev 499) +++ trunk/PelTag.php2007-03-24 19:49:11 UTC (rev 500) < at >< at > -3,7 +3,7 < at >< at > /* PEL: PHP Exif Library. A library with support for reading and * writing all Exif headers in JPEG and TIFF images using PHP. * - * Copyright (C) 2004, 2005, 2006 Martin Geisler. + * Copyright (C) 2004, 2005, 2006, 2007 Martin Geisler. * * 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 < at >< at > -720,7 +720,8 < at >< at > /** * Windows XP Title * - * Format: {< at >link PelFormat::BYTE}. + * Format: {< at >link PelFormat::BYTE}, modelled by the + * {< at >link PelEntryWindowsString} class. * * Components: any number. */ < at >< at > -730,7 +731,8 < at >< at > /** * Windows XP Comment * - * Format: {< at >link PelFormat::BYTE}. + * Format: {< at >link PelFormat::BYTE}, modelled by the + * {< at >link PelEntryWindowsString} class. * * Components: any number. */ < at >< at > -740,7 +742,8 < at >< at > /** * Windows XP Author * - * Format: {< at >link PelFormat::BYTE}. + * Format: {< at >link PelFormat::BYTE}, modelled by the + * {< at >link PelEntryWindowsString} class. * * Components: any number. */ < at >< at > -750,7 +753,8 < at >< at > /** * Windows XP Keywords * - * Format: {< at >link PelFormat::BYTE}. + * Format: {< at >link PelFormat::BYTE}, modelled by the + * {< at >link PelEntryWindowsString} class. * * Components: any number. */ < at >< at > -760,7 +764,8 < at >< at > /** * Windows XP Subject * - * Format: {< at >link PelFormat::BYTE}. + * Format: {< at >link PelFormat::BYTE}, modelled by the + * {< at >link PelEntryWindowsString} class. * * Components: any number. */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ------------------------------------------------------------------------- Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys-and earn cash http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV

[499] trunk

2007-03-10T00:18:23

Revision: 499 http://svn.sourceforge.net/pel/?rev=499&view=rev Author: mgeisler Date: 2007-03-09 16:18:23 -0800 (Fri, 09 Mar 2007) Log Message: ----------- Moved XP_* tags from Exif IFD to the IFD0/1 IFD as per the discussion with Piotr Golebiowski pel-devel. Please see http://permalink.gmane.org/gmane.comp.web.pel.devel/146 for the full discussion. Modified Paths: -------------- trunk/NEWS trunk/PelIfd.php Modified: trunk/NEWS =================================================================== --- trunk/NEWS2007-01-27 19:14:07 UTC (rev 498) +++ trunk/NEWS2007-03-10 00:18:23 UTC (rev 499) < at >< at > -20,7 +20,9 < at >< at > converts an image resource to a JPEG image. Thanks Csaba Gabor for asking about this. +* Moved the XP specific tags from the Exif IFD to the IFD0/1 IFD. + PEL Version 0.9.1 December 19th 2006 ************************************* Modified: trunk/PelIfd.php =================================================================== --- trunk/PelIfd.php2007-01-27 19:14:07 UTC (rev 498) +++ trunk/PelIfd.php2007-03-10 00:18:23 UTC (rev 499) < at >< at > -3,7 +3,7 < at >< at > /* PEL: PHP Exif Library. A library with support for reading and * writing all Exif headers in JPEG and TIFF images using PHP. * - * Copyright (C) 2004, 2005, 2006 Martin Geisler. + * Copyright (C) 2004, 2005, 2006, 2007 Martin Geisler. * * 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 < at >< at > -636,7 +636,12 < at >< at > PelTag::COPYRIGHT, PelTag::EXIF_IFD_POINTER, PelTag::GPS_INFO_IFD_POINTER, - PelTag::PRINT_IM); + PelTag::PRINT_IM, + PelTag::XP_TITLE, + PelTag::XP_COMMENT, + PelTag::XP_AUTHOR, + PelTag::XP_KEYWORDS, + PelTag::XP_SUBJECT); case PelIfd::EXIF: return array(PelTag::EXPOSURE_TIME, < at >< at > -665,11 +670,6 < at >< at > PelTag::SUB_SEC_TIME, PelTag::SUB_SEC_TIME_ORIGINAL, PelTag::SUB_SEC_TIME_DIGITIZED, - PelTag::XP_TITLE, - PelTag::XP_COMMENT, - PelTag::XP_AUTHOR, - PelTag::XP_KEYWORDS, - PelTag::XP_SUBJECT, PelTag::FLASH_PIX_VERSION, PelTag::COLOR_SPACE, PelTag::PIXEL_X_DIMENSION, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ------------------------------------------------------------------------- Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys-and earn cash http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV

[498] trunk

2007-01-27T19:14:07

Revision: 498 http://svn.sourceforge.net/pel/?rev=498&view=rev Author: mgeisler Date: 2007-01-27 11:14:07 -0800 (Sat, 27 Jan 2007) Log Message: ----------- Added the JPEG encoding quality controls. Modified Paths: -------------- trunk/NEWS trunk/Pel.php trunk/PelDataWindow.php Modified: trunk/NEWS =================================================================== --- trunk/NEWS2006-12-29 14:57:59 UTC (rev 497) +++ trunk/NEWS2007-01-27 19:14:07 UTC (rev 498) < at >< at > -1,10 +1,26 < at >< at > NEWS file for PEL: PHP Exif Library. A library with support for reading and writing Exif headers in JPEG and TIFF images using PHP. -Copyright (C) 2004, 2005, 2006 Martin Geisler. +Copyright (C) 2004, 2005, 2006, 2007 Martin Geisler. Licensed under the GNU GPL, see COPYING for details. +PEL Version 0.9.2 (Not yet released) +************************************* + +Notes: + +Added static method for controlling the quality for encoding JPEG +images. + +Changes: + +* Added static Pel::setJPEGQuality() and Pel::getJPEGQuality() method + for setting and getting the quailty used when PelJpeg automatically + converts an image resource to a JPEG image. Thanks Csaba Gabor for + asking about this. + + PEL Version 0.9.1 December 19th 2006 ************************************* Modified: trunk/Pel.php =================================================================== --- trunk/Pel.php2006-12-29 14:57:59 UTC (rev 497) +++ trunk/Pel.php2007-01-27 19:14:07 UTC (rev 498) < at >< at > -3,7 +3,7 < at >< at > /* PEL: PHP Exif Library. A library with support for reading and * writing all Exif headers in JPEG and TIFF images using PHP. * - * Copyright (C) 2004, 2005, 2006 Martin Geisler. + * Copyright (C) 2004, 2005, 2006, 2007 Martin Geisler. * * 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 < at >< at > -119,8 +119,43 < at >< at > */ private static $exceptions = array(); + /** + * Quality setting for encoding JPEG images. + * + * This controls the quality used then PHP image resources are + * encoded into JPEG images. This happens when you create a + * {< at >link PelJpeg} object based on an image resource. + * + * The default is 75 for average quality images, but you can change + * this to an integer between 0 and 100. + * + * < at >var int + */ + private static $quality = 75; + /** + * Set the JPEG encoding quality. + * + * < at >param int $quality an integer between 0 and 100 with 75 being + * average quality and 95 very good quality. + */ + function setJPEGQuality($quality) { + self::$quality = $quality; + } + + + /** + * Get current setting for JPEG encoding quality. + * + * < at >return int the quality. + */ + function getJPEGQuality() { + return self::$quality; + } + + + /** * Return list of stored exceptions. * * When PEL is parsing in non-strict mode, it will store most Modified: trunk/PelDataWindow.php =================================================================== --- trunk/PelDataWindow.php2006-12-29 14:57:59 UTC (rev 497) +++ trunk/PelDataWindow.php2007-01-27 19:14:07 UTC (rev 498) < at >< at > -3,7 +3,7 < at >< at > /* PEL: PHP Exif Library. A library with support for reading and * writing all Exif headers in JPEG and TIFF images using PHP. * - * Copyright (C) 2004, 2005, 2006 Martin Geisler. + * Copyright (C) 2004, 2005, 2006, 2007 Martin Geisler. * * 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 < at >< at > -131,7 +131,7 < at >< at > * instead of returning them in a more civil way as a string, so * we have to buffer the output... */ ob_start(); - ImageJpeg($data); + ImageJpeg($data, null, Pel::$quality); $this->data = ob_get_clean(); } else { throw new PelInvalidArgumentException('Bad type for $data: %s', This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ------------------------------------------------------------------------- Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys - and earn cash http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV

[497]phpdocumentor/pel/templates/media/stylesheet.css

2006-12-29T14:57:59

Revision: 497 http://svn.sourceforge.net/pel/?rev=497&view=rev Author: mgeisler Date: 2006-12-29 06:57:59 -0800 (Fri, 29 Dec 2006) Log Message: ----------- Use a less aggresive highlight on link hover. Modified Paths: -------------- phpdocumentor/pel/templates/media/stylesheet.css Modified: phpdocumentor/pel/templates/media/stylesheet.css =================================================================== --- phpdocumentor/pel/templates/media/stylesheet.css2006-12-29 14:39:05 UTC (rev 496) +++ phpdocumentor/pel/templates/media/stylesheet.css2006-12-29 14:57:59 UTC (rev 497) < at >< at > -1,5 +1,5 < at >< at > a { color: #000090; text-decoration: none; } -a:hover, a:active, a:focus { color: highlighttext; background-color: highlight; text-decoration: none; } +a:hover, a:active, a:focus { color: #3030D0; text-decoration: underline; } body { background: #FFFFFF; } body, table { font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 10pt; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ------------------------------------------------------------------------- Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys - and earn cash http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV

[496] phpdocumentor/pel/templates/classtrees.tpl

2006-12-29T14:39:06

Revision: 496 http://svn.sourceforge.net/pel/?rev=496&view=rev Author: mgeisler Date: 2006-12-29 06:39:05 -0800 (Fri, 29 Dec 2006) Log Message: ----------- Lower-case H2 element. Modified Paths: -------------- phpdocumentor/pel/templates/classtrees.tpl Modified: phpdocumentor/pel/templates/classtrees.tpl =================================================================== --- phpdocumentor/pel/templates/classtrees.tpl2006-12-29 14:37:49 UTC (rev 495) +++ phpdocumentor/pel/templates/classtrees.tpl2006-12-29 14:39:05 UTC (rev 496) < at >< at > -1,9 +1,9 < at >< at > {include file="header.tpl" top1=true} -

+

{$smarty.capture.title} -

+ {if $interfaces} {section name=classtrees loop=$interfaces}

Root interface {$interfaces[classtrees].class}

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ------------------------------------------------------------------------- Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys - and earn cash http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV

[495] phpdocumentor/pel/templates/basicindex.tpl

2006-12-29T14:37:49

Revision: 495 http://svn.sourceforge.net/pel/?rev=495&view=rev Author: mgeisler Date: 2006-12-29 06:37:49 -0800 (Fri, 29 Dec 2006) Log Message: ----------- Again an extra a element removed, removed a bunch of close tags for some title elements which should never have been there... Modified Paths: -------------- phpdocumentor/pel/templates/basicindex.tpl Modified: phpdocumentor/pel/templates/basicindex.tpl =================================================================== --- phpdocumentor/pel/templates/basicindex.tpl2006-12-29 14:28:03 UTC (rev 494) +++ phpdocumentor/pel/templates/basicindex.tpl2006-12-29 14:37:49 UTC (rev 495) < at >< at > -5,8 +5,7 < at >< at > {section name=index loop=$index} - -

{$index[index].letter}

top

< at >< at > -15,29 +14,45 < at >< at > {section name=contents loop=$index[index].index}

{if ($index[index].index[contents].title == "Variable")} - - {$index[index].index[contents].name} + + {$index[index].index[contents].name} {elseif ($index[index].index[contents].title == "Global")} - - {$index[index].index[contents].name} + + {$index[index].index[contents].name} {elseif ($index[index].index[contents].title == "Method")} - - {$index[index].index[contents].name} + + {$index[index].index[contents].name} {elseif ($index[index].index[contents].title == "Function")} - - {$index[index].index[contents].name} + + {$index[index].index[contents].name} {elseif ($index[index].index[contents].title == "Constant")} - - {$index[index].index[contents].name} + + {$index[index].index[contents].name} {elseif ($index[index].index[contents].title == "Page") || ($index[index].index[contents].title == "Include")} - - {$index[index].index[contents].name} + + {$index[index].index[contents].name} {elseif ($index[index].index[contents].title == "Class")} - - {$index[index].index[contents].name} + + {$index[index].index[contents].name} {else} - - {$index[index].index[contents].name} + + {$index[index].index[contents].name} {/if}

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ------------------------------------------------------------------------- Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys - and earn cash http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV

[494] phpdocumentor/pel/templates

2006-12-29T14:28:04

Revision: 494 http://svn.sourceforge.net/pel/?rev=494&view=rev Author: mgeisler Date: 2006-12-29 06:28:03 -0800 (Fri, 29 Dec 2006) Log Message: ----------- Add alt attributes to img elements, remove close tags for unopened span elements, remove some unnecessary a elements, probably some more. Modified Paths: -------------- phpdocumentor/pel/templates/class.tpl phpdocumentor/pel/templates/const.tpl phpdocumentor/pel/templates/define.tpl phpdocumentor/pel/templates/function.tpl phpdocumentor/pel/templates/global.tpl phpdocumentor/pel/templates/method.tpl phpdocumentor/pel/templates/var.tpl Modified: phpdocumentor/pel/templates/class.tpl =================================================================== --- phpdocumentor/pel/templates/class.tpl2006-12-29 14:25:29 UTC (rev 493) +++ phpdocumentor/pel/templates/class.tpl2006-12-29 14:28:03 UTC (rev 494) < at >< at > -1,9 +1,12 < at >< at > {include file="header.tpl" top3=true} -

{if $is_interface}Interface{/if} {$class_name}

+ + {if $is_interface}Interface{/if} {$class_name} +

< at >< at > -40,17 +43,20 < at >< at > {/if}

- {if $implements} -

- Implements interfaces: -

{$int}

- {/if} + {if $implements} +

+ Implements interfaces: +

{$int}

+ {/if} {include file="docblock.tpl" type="class" sdesc=$sdesc desc=$desc}

- Located in {$source_location} (line {if $class_slink}{$class_slink}{else}{$line_number}{/if}) + Located in {$source_location} (line {if + $class_slink}{$class_slink}{else}{$line_number}{/if})

{if $tutorial} < at >< at > -72,8 +78,7 < at >< at >

{if $children} - -

Direct descendents

Description | < at >< at > -112,8 +117,8 < at >< at > {$children[kids].link} < at >< at > -134,7 +139,7 < at >< at > {if $consts}

Class Constant Summary

< at >< at > -212,7 +218,7 < at >< at > {section name=vars loop=$vars} {if !$vars[vars].static}

- + {$vars[vars].var_type} {$vars[vars].var_name}

< at >< at > -226,7 +232,7 < at >< at > {if $methods}

Method Summary

Description | {if $children} < at >< at > -322,13 +328,12 < at >< at >

{include file="var.tpl"} {if $ivars} -

Inherited Variables

- +

Inherited Variables

{section name=ivars loop=$ivars}

Inherited from {$ivars[ivars].parent_class}

{section name=ivars2 loop=$ivars[ivars].ivars} - + {$ivars[ivars].ivars[ivars2].link}{if $ivars[ivars].ivars[ivars2].ivar_sdesc}: {$ivars[ivars].ivars[ivars2].ivar_sdesc}{/if}
< at >< at > -416,13 +421,12 < at >< at >
{include file="const.tpl"} {if $iconsts} -
Inherited Constants
- +
Inherited Constants
{section name=iconsts loop=$iconsts}
Inherited from {$iconsts[iconsts].parent_class}

{section name=iconsts2 loop=$iconsts[iconsts].iconsts} - + {$iconsts[iconsts].iconsts[iconsts2].link}{if $iconsts[iconsts].iconsts[iconsts2].iconst_sdesc}: {$iconsts[iconsts].iconsts[iconsts2].iconst_sdesc}{/if}
Modified: phpdocumentor/pel/templates/const.tpl =================================================================== --- phpdocumentor/pel/templates/const.tpl2006-12-29 14:25:29 UTC (rev 493) +++ phpdocumentor/pel/templates/const.tpl2006-12-29 14:28:03 UTC (rev 494) < at >< at > -1,9 +1,8 < at >< at > {section name=consts loop=$consts} - -
+

- + {$consts[consts].const_name} = {$consts[consts].const_value|replace:"\n":"
"} Modified: phpdocumentor/pel/templates/define.tpl =================================================================== --- phpdocumentor/pel/templates/define.tpl2006-12-29 14:25:29 UTC (rev 493) +++ phpdocumentor/pel/templates/define.tpl2006-12-29 14:28:03 UTC (rev 494) < at >< at > -3,7 +3,7 < at >< at >

- + {$defines[def].define_name} = {$defines[def].define_value|replace:"\n":"
"} (line {if $defines[def].slink}{$defines[def].slink}{else}{$defines[def].line_number}{/if}) Modified: phpdocumentor/pel/templates/function.tpl =================================================================== --- phpdocumentor/pel/templates/function.tpl2006-12-29 14:25:29 UTC (rev 493) +++ phpdocumentor/pel/templates/function.tpl2006-12-29 14:28:03 UTC (rev 494) < at >< at > -3,7 +3,7 < at >< at >

- + {$functions[func].function_name} (line {if $functions[func].slink}{$functions[func].slink}{else}{$functions[func].line_number}{/if})
Modified: phpdocumentor/pel/templates/global.tpl =================================================================== --- phpdocumentor/pel/templates/global.tpl2006-12-29 14:25:29 UTC (rev 493) +++ phpdocumentor/pel/templates/global.tpl2006-12-29 14:28:03 UTC (rev 494) < at >< at > -3,7 +3,7 < at >< at >

- + {$globals[glob].global_type} {$globals[glob].global_name} Modified: phpdocumentor/pel/templates/method.tpl =================================================================== --- phpdocumentor/pel/templates/method.tpl2006-12-29 14:25:29 UTC (rev 493) +++ phpdocumentor/pel/templates/method.tpl2006-12-29 14:28:03 UTC (rev 494) < at >< at > -1,11 +1,10 < at >< at > - + {section name=methods loop=$methods} {if $methods[methods].static} - -
+

- + static {$methods[methods].function_name} (line {if $methods[methods].slink}{$methods[methods].slink}{else}{$methods[methods].line_number}{/if})
< at >< at > -80,7 +79,7 < at >< at >

- + {if $methods[methods].ifunction_call.constructor}Constructor {elseif $methods[methods].ifunction_call.destructor}Destructor {/if}{$methods[methods].function_name} (line {if $methods[methods].slink}{$methods[methods].slink}{else}{$methods[methods].line_number}{/if})
Modified: phpdocumentor/pel/templates/var.tpl =================================================================== --- phpdocumentor/pel/templates/var.tpl2006-12-29 14:25:29 UTC (rev 493) +++ phpdocumentor/pel/templates/var.tpl2006-12-29 14:28:03 UTC (rev 494) < at >< at > -1,10 +1,9 < at >< at > {section name=vars loop=$vars} {if $vars[vars].static} - -
+

- + static {$vars[vars].var_type} {$vars[vars].var_name} < at >< at > -47,11 +46,10 < at >< at > {section name=vars loop=$vars} {if !$vars[vars].static} - -
+

- + {$vars[vars].var_type} {$vars[vars].var_name} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ------------------------------------------------------------------------- Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys - and earn cash http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV

[493] phpdocumentor/pel/templates/page.tpl

2006-12-29T14:25:29

Revision: 493 http://svn.sourceforge.net/pel/?rev=493&view=rev Author: mgeisler Date: 2006-12-29 06:25:29 -0800 (Fri, 29 Dec 2006) Log Message: ----------- Close img element properly, remove extra a element. Modified Paths: -------------- phpdocumentor/pel/templates/page.tpl Modified: phpdocumentor/pel/templates/page.tpl =================================================================== --- phpdocumentor/pel/templates/page.tpl2006-12-29 14:24:00 UTC (rev 492) +++ phpdocumentor/pel/templates/page.tpl2006-12-29 14:25:29 UTC (rev 493) < at >< at > -1,9 +1,13 < at >< at > {include file="header.tpl" top3=true} -

{$source_location}

+ + {$source_location} +

- -

Description

{if $classes || $includes || $defines || $globals || $functions} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ------------------------------------------------------------------------- Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys - and earn cash http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV