[Linpha-cvs] SF.net SVN: linpha: [4742] trunk/linpha2
Status: Inactive
Brought to you by:
bzrudi
From: <bz...@us...> - 2007-07-11 15:46:36
|
Revision: 4742 http://svn.sourceforge.net/linpha/?rev=4742&view=rev Author: bzrudi Date: 2007-07-11 07:34:04 -0700 (Wed, 11 Jul 2007) Log Message: ----------- moved pjmt Modified Paths: -------------- trunk/linpha2/ChangeLog trunk/linpha2/lib/classes/linpha.image.class.php trunk/linpha2/lib/classes/linpha.import.class.php trunk/linpha2/lib/classes/linpha.metadata.class.php trunk/linpha2/lib/classes/linpha.pjmt.class.php trunk/linpha2/lib/include/metadata_info_show.php trunk/linpha2/lib/include/metadata_iptc_edit.php Removed Paths: ------------- trunk/linpha2/lib/classes/pjmt/ Modified: trunk/linpha2/ChangeLog =================================================================== --- trunk/linpha2/ChangeLog 2007-07-10 21:08:45 UTC (rev 4741) +++ trunk/linpha2/ChangeLog 2007-07-11 14:34:04 UTC (rev 4742) @@ -1,3 +1,7 @@ +2007-07-11 bzrudi + * Moved /lib/classes/pjmt/ -> /lib/pjmt/ as it's not a class lib at all + * Moved /lib/classes/exiftool/ -> /lib/exiftool/ + 2007-07-10 bzrudi * Make use exiftool for video information, so we can remove getid3 completely. I don't like to keep it just to get width and height. Modified: trunk/linpha2/lib/classes/linpha.image.class.php =================================================================== --- trunk/linpha2/lib/classes/linpha.image.class.php 2007-07-10 21:08:45 UTC (rev 4741) +++ trunk/linpha2/lib/classes/linpha.image.class.php 2007-07-11 14:34:04 UTC (rev 4742) @@ -472,24 +472,24 @@ $dummy_thumbnail = LINPHA_DIR.'/lib/graphics/avi_mov.gif'; $this->img_thumbsize = $GLOBALS['linpha']->sql->config->value['sys_style_thumb_size_max']; $this->img_quality = 75; + $this->imageTool->orgWidth = 320; + $this->imageTool->orgHeight = 240; + $found_thumbnail = false; /** - * check if we can get a thumbnail - */ - $found_thumbnail = false; - - /** * check if there exists a .thm file * (video thumbnail of Canon videos) */ $pos = strrpos($this->src_file,'.'); $start = substr($this->src_file,0,$pos); $thm_file = $start.'.thm'; + if(file_exists($thm_file)) { - list($this->org_width, $this->org_height, $file_type) = LinIdentify::linGetImageSize($thm_file); - $this->src_file = $thm_file; - + list($this->org_width, $this->org_height, $file_type) = + LinIdentify::linGetImageSize($thm_file); + + $this->src_file = $thm_file; $this->imageTool->orgWidth = $this->org_width; $this->imageTool->orgHeight = $this->org_height; $this->imageTool->imgType = $file_type; @@ -512,7 +512,16 @@ if($objExifTool->getEmbeddedThumbnail($this->src_file, $this->output_file)) { - $found_thumbnail = true; + /** + * get width and height from thumb + + list($this->org_width, $this->org_height, $file_type) = + LinIdentify::linGetImageSize($this->src_file); + + $this->imageTool->orgWidth = $this->org_width; + $this->imageTool->orgHeight = $this->org_height; + */ + $found_thumbnail = true; } else // try getting at least codec for imagemagick { @@ -543,14 +552,12 @@ { $found_thumbnail = false; } - } } else { $found_thumbnail = false; } - } } else @@ -581,6 +588,7 @@ $this->imageTool->orgWidth = $this->img_thumbsize; // only used with gdlib $this->imageTool->orgHeight = $this->img_thumbsize; // only used with gdlib + //$this->imageTool->createImage($this->output_file,$this->output_file,$this->imageTool->orgWidth,$this->imageTool->orgHeight,$this->rotate,$watermark=1); $this->imageTool->createImage($this->output_file,$this->output_file,$this->img_thumbsize,$this->img_thumbsize,$this->rotate,$watermark=1); } else Modified: trunk/linpha2/lib/classes/linpha.import.class.php =================================================================== --- trunk/linpha2/lib/classes/linpha.import.class.php 2007-07-10 21:08:45 UTC (rev 4741) +++ trunk/linpha2/lib/classes/linpha.import.class.php 2007-07-11 14:34:04 UTC (rev 4742) @@ -488,7 +488,7 @@ //list($time_exif, $rotate) = //$MetaData->getBasicMeta($dirname, $filename); - include_once( LINPHA_DIR.'/lib/classes/pjmt/EXIF.php' ); + include_once( LINPHA_DIR.'/lib/pjmt/EXIF.php' ); $meta = get_EXIF_JPEG($dirname.'/'.$filename); /** Modified: trunk/linpha2/lib/classes/linpha.metadata.class.php =================================================================== --- trunk/linpha2/lib/classes/linpha.metadata.class.php 2007-07-10 21:08:45 UTC (rev 4741) +++ trunk/linpha2/lib/classes/linpha.metadata.class.php 2007-07-11 14:34:04 UTC (rev 4742) @@ -19,7 +19,7 @@ */ if (!defined('LINPHA_DIR')) { exit (1); } -include_once LINPHA_DIR.'/lib/classes/pjmt/Unicode.php'; +include_once LINPHA_DIR.'/lib/pjmt/Unicode.php'; /** * This is the baseclass to handle all the EXIF/IPTC/XMP stuff used in LinPHA Modified: trunk/linpha2/lib/classes/linpha.pjmt.class.php =================================================================== --- trunk/linpha2/lib/classes/linpha.pjmt.class.php 2007-07-10 21:08:45 UTC (rev 4741) +++ trunk/linpha2/lib/classes/linpha.pjmt.class.php 2007-07-11 14:34:04 UTC (rev 4742) @@ -43,8 +43,8 @@ */ public function saveMetaData($filename, $md5sum, $metatype) { - include_once (LINPHA_DIR . '/lib/classes/pjmt/JPEG.php'); - include_once (LINPHA_DIR . '/lib/classes/pjmt/EXIF.php'); + include_once (LINPHA_DIR . '/lib/pjmt/JPEG.php'); + include_once (LINPHA_DIR . '/lib/pjmt/EXIF.php'); $str_columns = "md5sum, "; $str_values = "'" . $md5sum . "', "; @@ -194,7 +194,7 @@ **/ public function getBasicMeta($dirname, $filename) { - include_once( LINPHA_DIR.'/lib/classes/pjmt/EXIF.php' ); + include_once( LINPHA_DIR.'/lib/pjmt/EXIF.php' ); $date = ""; $meta = get_EXIF_JPEG($dirname.'/'.$filename); Modified: trunk/linpha2/lib/include/metadata_info_show.php =================================================================== --- trunk/linpha2/lib/include/metadata_info_show.php 2007-07-10 21:08:45 UTC (rev 4741) +++ trunk/linpha2/lib/include/metadata_info_show.php 2007-07-11 14:34:04 UTC (rev 4742) @@ -1,274 +1,274 @@ -<?php -if(!defined('LINPHA_DIR')) { exit(1); } - -/** - * check permissions - */ -if( !LinSql::photoIsAllowed( $GLOBALS['linpha']->template->idCurrent, $sql_perm_type = 'read' ) ) -{ - echo i18n("Access Denied!"); - exit(); -} - -/** - * valid id? - */ -$data = $GLOBALS['linpha']->db->GetRow( - "SELECT id, img_type FROM ".LIN_PREFIX."photos " . - "WHERE id = '".LinSql::linAddslashes($GLOBALS['linpha']->template->idCurrent)."'" -); - -if( ! isset($data['id']) ) -{ - echo i18n("Access Denied!"); - exit(); -} - -/** - * only images - */ -if( ! LinIdentify::isSupportedImage($data['img_type'])) -{ - echo i18n("This Is Not An Image!"); - exit; -} - -$filename = LinSql::getFullImagePath( $GLOBALS['linpha']->template->idCurrent ); -$filenameShow = implode( '/', LinSql::getFullFilenameFromId( $GLOBALS['linpha']->template->idCurrent ) ); - -?> -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> -<html> - -<!--*************************************************************************** -* -* Filename: Example.php -* -* Description: An example of how the PHP JPEG Metadata Toolkit can be used to -* display JPEG Metadata. -* -* Author: Evan Hunter -* -* Date: 30/7/2004 -* -* Project: PHP JPEG Metadata Toolkit -* -* Revision: 1.11 -* -* Changes: 1.00 -> 1.10 : Changed name of GET parameter from 'filename' to 'jpeg_fname' -* to stop script-kiddies using the google command 'allinurl:*.php?filename=*' -* to find servers to attack -* Changed behavior when no filename is given, to be cleaner -* 1.10 -> 1.11 : Changed displayed toolkit version numbers to reference Toolkit_Version.php -* Changed this example file to be easily relocatable -* -* URL: http://electronics.ozhiker.com -* -* Copyright: Copyright Evan Hunter 2004 -* -* License: This file is part of the PHP JPEG Metadata Toolkit. -* -* The PHP JPEG Metadata Toolkit 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. -* -* The PHP JPEG Metadata Toolkit 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 the PHP JPEG Metadata Toolkit; if not, -* write to the Free Software Foundation, Inc., 59 Temple -* Place, Suite 330, Boston, MA 02111-1307 USA -* -* If you require a different license for commercial or other -* purposes, please contact the author: ev...@oz... -* -***************************************************************************--> - - <head> - - <META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css"> - <STYLE TYPE="text/css" MEDIA="screen, print, projection"> - <!-- - - BODY { background-color:#505050; color:#F0F0F0 } - a { color:orange } - .EXIF_Main_Heading { color:red } - .EXIF_Secondary_Heading{ color: orange} - .EXIF_Table { border-collapse: collapse ; border: 1px solid #909000} - .EXIF_Table tbody td{border-width: 1px; border-style:solid; border-color: #909000;} - - --> - </STYLE> - - - <?php - // Turn off Error Reporting - error_reporting ( 0 ); - - // Change: Allow this example file to be easily relocatable - as of version 1.11 - /**$Toolkit_Dir = "./"; // Ensure dir name includes trailing slash*/ - - // Hide any unknown EXIF tags - $GLOBALS['HIDE_UNKNOWN_TAGS'] = TRUE; - - /**include $Toolkit_Dir . 'Toolkit_Version.php'; // Change: added as of version 1.11 - include $Toolkit_Dir . 'JPEG.php'; // Change: Allow this example file to be easily relocatable - as of version 1.11 - include $Toolkit_Dir . 'JFIF.php'; - include $Toolkit_Dir . 'PictureInfo.php'; - include $Toolkit_Dir . 'XMP.php'; - include $Toolkit_Dir . 'Photoshop_IRB.php'; - include $Toolkit_Dir . 'EXIF.php';*/ - - include_once(LINPHA_DIR.'/lib/classes/pjmt/Toolkit_Version.php'); // Change: added as of version 1.11 - include_once(LINPHA_DIR.'/lib/classes/pjmt/JPEG.php'); // Change: Allow this example file to be easily relocatable - as of version 1.11 - include_once(LINPHA_DIR.'/lib/classes/pjmt/JFIF.php'); - include_once(LINPHA_DIR.'/lib/classes/pjmt/PictureInfo.php'); - include_once(LINPHA_DIR.'/lib/classes/pjmt/XMP.php'); - include_once(LINPHA_DIR.'/lib/classes/pjmt/Photoshop_IRB.php'); - include_once(LINPHA_DIR.'/lib/classes/pjmt/EXIF.php'); - - /** - // Retrieve the JPEG image filename from the http url request - if ( ( !array_key_exists( 'jpeg_fname', $GLOBALS['HTTP_GET_VARS'] ) ) || - ( $GLOBALS['HTTP_GET_VARS']['jpeg_fname'] == "" ) ) - { - echo "<title>No image filename defined</title>\n"; - echo "</head>\n"; - echo "<body>\n"; - echo "<p>No image filename defined - use GET method with field: jpeg_fname</p>\n"; - echo "<p><a href=\"http://www.ozhiker.com/electronics/pjmt/\" >PHP JPEG Metadata Toolkit version " . $GLOBALS['Toolkit_Version'] . ", Copyright (C) 2004 Evan Hunter</a></p>\n"; // Change: displayed toolkit version numbers to reference Toolkit_Version.php - as of version 1.11 - echo "</body>\n"; - exit( ); - } - else - { - $filename = $GLOBALS['HTTP_GET_VARS']['jpeg_fname']; - }*/ - - - // Output the title - echo "<title>Metadata details for $filenameShow</title>"; - - // Retrieve the header information - $jpeg_header_data = get_jpeg_header_data( $filename ); - - ?> - - </head> - - <body> - - <p>Interpreted using: <a href="http://www.ozhiker.com/electronics/pjmt/" >PHP JPEG Metadata Toolkit version <?php echo $GLOBALS['Toolkit_Version'] ?>, Copyright (C) 2004 Evan Hunter</a></p> <!-- Change: displayed toolkit version numbers to reference Toolkit_Version.php - as of version 1.11 --> - <br> - <br> - - <h1><B><U>Metadata for "<?php echo $filenameShow; ?>"</U></B></h1> - <br> - - <?php - /** - <!-- Output a link allowing user to edit the Photoshop File Info - Change: Allow this example file to be easily relocatable - as of version 1.11 - --> - <?php $relative_filename = get_relative_path( $filename, $Toolkit_Dir ); ?> - <h4><a href="<?php echo $Toolkit_Dir."Edit_File_Info_Example.php?jpeg_fname=$relative_filename"; ?>" >Click here to edit the Photoshop File Info for this file</a></h4> - <br> - */ - ?> - - - - <!-- Output the information about the APP segments --> - <?php echo Generate_JPEG_APP_Segment_HTML( $jpeg_header_data ); ?> - - <BR> - <HR> - <BR> - - <!-- Output the Intrinsic JPEG Information --> - <?php echo Interpret_intrinsic_values_to_HTML( get_jpeg_intrinsic_values( $jpeg_header_data ) ); ?> - - <BR> - <HR> - <BR> - - <!-- Output the JPEG Comment --> - <?php echo Interpret_Comment_to_HTML( $jpeg_header_data ); ?> - - <BR> - <HR> - <BR> - - <!-- Output the JPEG File Interchange Format Information --> - <?php echo Interpret_JFIF_to_HTML( get_JFIF( $jpeg_header_data ), $filename ); ?> - - <BR> - <HR> - <BR> - - <!-- Output the JFIF Extension Information --> - <?php echo Interpret_JFXX_to_HTML( get_JFXX( $jpeg_header_data ), $filename ); ?> - - <BR> - <HR> - <BR> - - <!-- Output the Picture Info Text --> - <?php echo Interpret_App12_Pic_Info_to_HTML( $jpeg_header_data ); ?> - - <BR> - <HR> - <BR> - - <!-- Output the EXIF Information --> - <?php echo Interpret_EXIF_to_HTML( get_EXIF_JPEG( $filename ), $filename ); ?> - - <BR> - <HR> - <BR> - - <!-- Output the XMP Information --> - <?php echo Interpret_XMP_to_HTML( read_XMP_array_from_text( get_XMP_text( $jpeg_header_data ) ) ); ?> - <BR> - <HR> - <BR> - - <!-- Output the Photoshop IRB (including the IPTC-NAA info --> - <?php echo Interpret_IRB_to_HTML( get_Photoshop_IRB( $jpeg_header_data ), $filename ); ?> - - <BR> - <HR> - <BR> - - <!-- Output the Meta Information --> - <?php echo Interpret_EXIF_to_HTML( get_Meta_JPEG( $filename ), $filename ); ?> - - <BR> - <HR> - <BR> - - <?php - /** - <!-- Display the original image --> - - <h2>Original Image</h2> - <?php echo "<img src=\"$filename\">"; ?> - */ - ?> - - - <BR> - <BR> - <BR> - <p>Interpreted using:</p> - <p><a href="http://www.ozhiker.com/electronics/pjmt/" >PHP JPEG Metadata Toolkit version <?php echo $GLOBALS['Toolkit_Version'] ?>, Copyright (C) 2004 Evan Hunter</a></p> <!-- Change: displayed toolkit version numbers to reference Toolkit_Version.php - as of version 1.11 --> - - </body> - +<?php +if(!defined('LINPHA_DIR')) { exit(1); } + +/** + * check permissions + */ +if( !LinSql::photoIsAllowed( $GLOBALS['linpha']->template->idCurrent, $sql_perm_type = 'read' ) ) +{ + echo i18n("Access Denied!"); + exit(); +} + +/** + * valid id? + */ +$data = $GLOBALS['linpha']->db->GetRow( + "SELECT id, img_type FROM ".LIN_PREFIX."photos " . + "WHERE id = '".LinSql::linAddslashes($GLOBALS['linpha']->template->idCurrent)."'" +); + +if( ! isset($data['id']) ) +{ + echo i18n("Access Denied!"); + exit(); +} + +/** + * only images + */ +if( ! LinIdentify::isSupportedImage($data['img_type'])) +{ + echo i18n("This Is Not An Image!"); + exit; +} + +$filename = LinSql::getFullImagePath( $GLOBALS['linpha']->template->idCurrent ); +$filenameShow = implode( '/', LinSql::getFullFilenameFromId( $GLOBALS['linpha']->template->idCurrent ) ); + +?> +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> +<html> + +<!--*************************************************************************** +* +* Filename: Example.php +* +* Description: An example of how the PHP JPEG Metadata Toolkit can be used to +* display JPEG Metadata. +* +* Author: Evan Hunter +* +* Date: 30/7/2004 +* +* Project: PHP JPEG Metadata Toolkit +* +* Revision: 1.11 +* +* Changes: 1.00 -> 1.10 : Changed name of GET parameter from 'filename' to 'jpeg_fname' +* to stop script-kiddies using the google command 'allinurl:*.php?filename=*' +* to find servers to attack +* Changed behavior when no filename is given, to be cleaner +* 1.10 -> 1.11 : Changed displayed toolkit version numbers to reference Toolkit_Version.php +* Changed this example file to be easily relocatable +* +* URL: http://electronics.ozhiker.com +* +* Copyright: Copyright Evan Hunter 2004 +* +* License: This file is part of the PHP JPEG Metadata Toolkit. +* +* The PHP JPEG Metadata Toolkit 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. +* +* The PHP JPEG Metadata Toolkit 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 the PHP JPEG Metadata Toolkit; if not, +* write to the Free Software Foundation, Inc., 59 Temple +* Place, Suite 330, Boston, MA 02111-1307 USA +* +* If you require a different license for commercial or other +* purposes, please contact the author: ev...@oz... +* +***************************************************************************--> + + <head> + + <META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css"> + <STYLE TYPE="text/css" MEDIA="screen, print, projection"> + <!-- + + BODY { background-color:#505050; color:#F0F0F0 } + a { color:orange } + .EXIF_Main_Heading { color:red } + .EXIF_Secondary_Heading{ color: orange} + .EXIF_Table { border-collapse: collapse ; border: 1px solid #909000} + .EXIF_Table tbody td{border-width: 1px; border-style:solid; border-color: #909000;} + + --> + </STYLE> + + + <?php + // Turn off Error Reporting + error_reporting ( 0 ); + + // Change: Allow this example file to be easily relocatable - as of version 1.11 + /**$Toolkit_Dir = "./"; // Ensure dir name includes trailing slash*/ + + // Hide any unknown EXIF tags + $GLOBALS['HIDE_UNKNOWN_TAGS'] = TRUE; + + /**include $Toolkit_Dir . 'Toolkit_Version.php'; // Change: added as of version 1.11 + include $Toolkit_Dir . 'JPEG.php'; // Change: Allow this example file to be easily relocatable - as of version 1.11 + include $Toolkit_Dir . 'JFIF.php'; + include $Toolkit_Dir . 'PictureInfo.php'; + include $Toolkit_Dir . 'XMP.php'; + include $Toolkit_Dir . 'Photoshop_IRB.php'; + include $Toolkit_Dir . 'EXIF.php';*/ + + include_once(LINPHA_DIR.'/lib/pjmt/Toolkit_Version.php'); // Change: added as of version 1.11 + include_once(LINPHA_DIR.'/lib/pjmt/JPEG.php'); // Change: Allow this example file to be easily relocatable - as of version 1.11 + include_once(LINPHA_DIR.'/lib/pjmt/JFIF.php'); + include_once(LINPHA_DIR.'/lib/pjmt/PictureInfo.php'); + include_once(LINPHA_DIR.'/lib/pjmt/XMP.php'); + include_once(LINPHA_DIR.'/lib/pjmt/Photoshop_IRB.php'); + include_once(LINPHA_DIR.'/lib/pjmt/EXIF.php'); + + /** + // Retrieve the JPEG image filename from the http url request + if ( ( !array_key_exists( 'jpeg_fname', $GLOBALS['HTTP_GET_VARS'] ) ) || + ( $GLOBALS['HTTP_GET_VARS']['jpeg_fname'] == "" ) ) + { + echo "<title>No image filename defined</title>\n"; + echo "</head>\n"; + echo "<body>\n"; + echo "<p>No image filename defined - use GET method with field: jpeg_fname</p>\n"; + echo "<p><a href=\"http://www.ozhiker.com/electronics/pjmt/\" >PHP JPEG Metadata Toolkit version " . $GLOBALS['Toolkit_Version'] . ", Copyright (C) 2004 Evan Hunter</a></p>\n"; // Change: displayed toolkit version numbers to reference Toolkit_Version.php - as of version 1.11 + echo "</body>\n"; + exit( ); + } + else + { + $filename = $GLOBALS['HTTP_GET_VARS']['jpeg_fname']; + }*/ + + + // Output the title + echo "<title>Metadata details for $filenameShow</title>"; + + // Retrieve the header information + $jpeg_header_data = get_jpeg_header_data( $filename ); + + ?> + + </head> + + <body> + + <p>Interpreted using: <a href="http://www.ozhiker.com/electronics/pjmt/" >PHP JPEG Metadata Toolkit version <?php echo $GLOBALS['Toolkit_Version'] ?>, Copyright (C) 2004 Evan Hunter</a></p> <!-- Change: displayed toolkit version numbers to reference Toolkit_Version.php - as of version 1.11 --> + <br> + <br> + + <h1><B><U>Metadata for "<?php echo $filenameShow; ?>"</U></B></h1> + <br> + + <?php + /** + <!-- Output a link allowing user to edit the Photoshop File Info + Change: Allow this example file to be easily relocatable - as of version 1.11 + --> + <?php $relative_filename = get_relative_path( $filename, $Toolkit_Dir ); ?> + <h4><a href="<?php echo $Toolkit_Dir."Edit_File_Info_Example.php?jpeg_fname=$relative_filename"; ?>" >Click here to edit the Photoshop File Info for this file</a></h4> + <br> + */ + ?> + + + + <!-- Output the information about the APP segments --> + <?php echo Generate_JPEG_APP_Segment_HTML( $jpeg_header_data ); ?> + + <BR> + <HR> + <BR> + + <!-- Output the Intrinsic JPEG Information --> + <?php echo Interpret_intrinsic_values_to_HTML( get_jpeg_intrinsic_values( $jpeg_header_data ) ); ?> + + <BR> + <HR> + <BR> + + <!-- Output the JPEG Comment --> + <?php echo Interpret_Comment_to_HTML( $jpeg_header_data ); ?> + + <BR> + <HR> + <BR> + + <!-- Output the JPEG File Interchange Format Information --> + <?php echo Interpret_JFIF_to_HTML( get_JFIF( $jpeg_header_data ), $filename ); ?> + + <BR> + <HR> + <BR> + + <!-- Output the JFIF Extension Information --> + <?php echo Interpret_JFXX_to_HTML( get_JFXX( $jpeg_header_data ), $filename ); ?> + + <BR> + <HR> + <BR> + + <!-- Output the Picture Info Text --> + <?php echo Interpret_App12_Pic_Info_to_HTML( $jpeg_header_data ); ?> + + <BR> + <HR> + <BR> + + <!-- Output the EXIF Information --> + <?php echo Interpret_EXIF_to_HTML( get_EXIF_JPEG( $filename ), $filename ); ?> + + <BR> + <HR> + <BR> + + <!-- Output the XMP Information --> + <?php echo Interpret_XMP_to_HTML( read_XMP_array_from_text( get_XMP_text( $jpeg_header_data ) ) ); ?> + <BR> + <HR> + <BR> + + <!-- Output the Photoshop IRB (including the IPTC-NAA info --> + <?php echo Interpret_IRB_to_HTML( get_Photoshop_IRB( $jpeg_header_data ), $filename ); ?> + + <BR> + <HR> + <BR> + + <!-- Output the Meta Information --> + <?php echo Interpret_EXIF_to_HTML( get_Meta_JPEG( $filename ), $filename ); ?> + + <BR> + <HR> + <BR> + + <?php + /** + <!-- Display the original image --> + + <h2>Original Image</h2> + <?php echo "<img src=\"$filename\">"; ?> + */ + ?> + + + <BR> + <BR> + <BR> + <p>Interpreted using:</p> + <p><a href="http://www.ozhiker.com/electronics/pjmt/" >PHP JPEG Metadata Toolkit version <?php echo $GLOBALS['Toolkit_Version'] ?>, Copyright (C) 2004 Evan Hunter</a></p> <!-- Change: displayed toolkit version numbers to reference Toolkit_Version.php - as of version 1.11 --> + + </body> + </html> \ No newline at end of file Modified: trunk/linpha2/lib/include/metadata_iptc_edit.php =================================================================== --- trunk/linpha2/lib/include/metadata_iptc_edit.php 2007-07-10 21:08:45 UTC (rev 4741) +++ trunk/linpha2/lib/include/metadata_iptc_edit.php 2007-07-11 14:34:04 UTC (rev 4742) @@ -47,7 +47,7 @@ /** * We are going to save all IPTC data UTF8 encoded in database */ -include_once(LINPHA_DIR.'/lib/classes/pjmt/Unicode.php'); +include_once(LINPHA_DIR.'/lib/pjmt/Unicode.php'); $MetaData = new LinMetaData(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |