Araxis Merge File Comparison Report

Produced by Araxis Merge on Mon Jan 24 00:08:38 2005 UTC. See www.araxis.com for information about Merge. This report uses XHTML and CSS2, and is best viewed with a reasonably standards compliant browser such as the latest version of Internet Explorer. For optimum results when printing this report, enable printing of background images and colours in your browser and use landscape orientation.

1. Files compared

# Location File Last Modified
1 e:\tech\cvs\coppermine\stable-head\include exifReader.inc.php Sat Jul 24 15:04:09 2004 UTC
2 e:\tech\cvs\coppermine\stable\include exifReader.inc.php Sat Dec 4 02:09:22 2004 UTC

2. Comparison summary

Description Between
Files 1 and 2
Blocks Lines
Unchanged 6 1501
Changed 4 28
Inserted 1 2
Removed 0 0

3. Comparison options

Whitespace All differences in whitespace within lines are ignored
Character case Differences in character case are significant
Line endings Differences in line endings (CR and LF characters) are ignored
CR/LF characters Hidden in comparison detail

4. Active regular expressions

No regular expressions were active.

5. Comparison detail

1   <?php   1   <?php
2   // ------------------------------------------------------------------------- //   2   // ------------------------------------------------------------------------- //
3   // Coppermine Photo Gallery 1.3.2                                            //   3   // Coppermine Photo Gallery 1.3.2                                            //
4   // ------------------------------------------------------------------------- //   4   // ------------------------------------------------------------------------- //
(149 unchanged lines omitted)
154   /** * Aperture */   154   /** * Aperture */
155   define("TAG_MAXAPERTURE","0x9205");   155   define("TAG_MAXAPERTURE","0x9205");
156   /** * Lens Focal Length */   156   /** * Lens Focal Length */
157   define("TAG_FOCALLENGTH","0x920A");   157   define("TAG_FOCALLENGTH","0x920A");
    158   /** * Subject Area within frame */
    159   define("TAG_SUBJECTAREA","0x9214");
158   /** * The date and time when the original image data was generated. */   160   /** * The date and time when the original image data was generated. */
159   define("TAG_DATETIME_ORIGINAL","0x9003");   161   define("TAG_DATETIME_ORIGINAL","0x9003");
160   /** * User Comments */   162   /** * User Comments */
161   define("TAG_USERCOMMENT","0x9286");   163   define("TAG_USERCOMMENT","0x9286");
(576 unchanged lines omitted)
738                       if (($ValuePtr[0].$ValuePtr[1].$ValuePtr[2].$ValuePtr[3].$ValuePtr[4]) == "ASCII"){   740                       if (($ValuePtr[0].$ValuePtr[1].$ValuePtr[2].$ValuePtr[3].$ValuePtr[4]) == "ASCII"){
739                           for ($a=5;$a<10;$a++){   741                           for ($a=5;$a<10;$a++){
740                               $c = $ValuePtr[$a];   742                               $c = $ValuePtr[$a];
741                               if ($c != '\0' && $c != ' '){   743                               if ($c != '\0' && $c != ' '){
742                                   $tmp = substr($ValuePtr, 0 ,$ByteCount   );   744                                   $tmp = substr($ValuePtr, $a ,$ByteCount -$a );
743                                       break;   745                                       break;
744                               }   746                               }
745                           }   747                           }
746                       } else if (($ValuePtr[0].$ValuePtr[1].$ValuePtr[2].$ValuePtr[3].$ValuePtr[4].$ValuePtr[5].$ValuePtr[6]) == "Unicode"){   748                       } else if (($ValuePtr[0].$ValuePtr[1].$ValuePtr[2].$ValuePtr[3].$ValuePtr[4].$ValuePtr[5].$ValuePtr[6]) == "Unicode"){
(29 unchanged lines omitted)
776                           $tmpArr =  $this->ConvertAnyFormat($ValuePtr, $Format);   778                           $tmpArr =  $this->ConvertAnyFormat($ValuePtr, $Format);
777                           $this->ImageInfo['h']["aperture"] = exp($tmpArr[0]*log(2)*0.5);   779                           $this->ImageInfo['h']["aperture"] = exp($tmpArr[0]*log(2)*0.5);
778                       }   780                       }
779                       break;   781                       break;
780       782                   case TAG_SUBJECTAREA:
    783                       for ($tmp=0;$tmp < $Components; $tmp++) {
    784                           $tmpArr[$tmp] = $this->ConvertAnyFormat($ValuePtr+($tmp*$this->BytesPerFormat[$Format]), $Format);
    785                       }
    786                       switch ($Components) {
    787                       case 4: // rectangle center X/Y, width, height
    788                           $tmp = ', W='.$tmpArr[2].' x H='.$tmpArr[3];
    789                           break;
    790                       case 3: // circle  center X/Y, diam
    791                           $tmp = ', diam='.$tmpArr[2];
    792                       }
    793                       if ($Components > 1) { // have center for all cases
    794                           $tmp = '('.$tmpArr[0].','.$tmpArr[1].')'.$tmp;
    795                       }
    796                       $this->ImageInfo['h']["subjectArea"] = $tmp;
    797                       break;
781                   case TAG_FOCALLENGTH:   798                   case TAG_FOCALLENGTH:
782                       // Nice digital cameras actually save the focal length as a function   799                       // Nice digital cameras actually save the focal length as a function
783                       // of how farthey are zoomed in.   800                       // of how farthey are zoomed in.
784                       $tmp = $this->ConvertAnyFormat($ValuePtr, $Format);   801                       $tmp = $this->ConvertAnyFormat($ValuePtr, $Format);
(100 unchanged lines omitted)
885                       break;   902                       break;
886     903  
887                   case TAG_WHITEBALANCE:   904                   case TAG_WHITEBALANCE:
888                       $tmp = (int) $this->ConvertAnyFormat($ValuePtr, $Format);   905                       $tmp = (int) $this->ConvertAnyFormat($ValuePtr, $Format);
889                       $tmpArr = array("1"=>"Sunny","2"=>"fluorescent","3"=>"incandescent");   906                       $tmpArr = array('0'=>'Unknown',"1"=>"daylight","2"=>"fluorescent","3"=>"incandescent",'4'=>'flash', '9'=>'Fine weather','10'=>'Cloudy','11'=>'Shade','12'=>'Daylight fluorescent (5700-7100K)','13'=>'Day white fluorescent (4600-5400K)', '14'=>'Cool white fluorescent (3900-4500K)','15'=>'White fluorescent (3200-3700K)','17'=>'Std light A','18'=>'Std Light B','19'=>'Std Light C','20'=>'D55','21'=>'D65','22'=>'D75','23'=>'D50','24'=>'ISO studio tungsten','255'=>Other);
890                       $this->ImageInfo['h']["whiteBalance"] =     907                       $this->ImageInfo['h']["whiteBalance"] =  $tmp;
891                             (isset($tmpArr["$tmp"]) ? $tmpArr["$tmp"] : " Cloudy ");   908                          //  (isset($tmpArr["$tmp"]) ? $tmpArr["$tmp"] : " ?? ");
892                       break;   909                       break;
893     910  
894                   case TAG_METERING_MODE:   911                   case TAG_METERING_MODE:
895                       $tmp = (int) $this->ConvertAnyFormat($ValuePtr, $Format);   912                       $tmp = (int) $this->ConvertAnyFormat($ValuePtr, $Format);
(140 unchanged lines omitted)
1036                           $this->ImageInfo['h']["exposureMode"] =   1053                           $this->ImageInfo['h']["exposureMode"] =
1037                               (isset($tmpArr["$tmp"]) ? $tmpArr["$tmp"] : "Reserved");   1054                               (isset($tmpArr["$tmp"]) ? $tmpArr["$tmp"] : "Reserved");
1038                           break;   1055                           break;
1039                   case TAG_WHITE_BALANCE:   1056                   case TAG_WHITE_BALANCE:
1040                           $t his->I m ageInfo['h']["whiteBalance"]  = $this->ConvertAnyFormat($ValuePtr, $Format);   1057                           $t   m p  = $this->ConvertAnyFormat($ValuePtr, $Format);
    1058                           $this->ImageInfo['h']["whiteBalanceAuto"] = ($tmp ? "Manual " : "Auto ");
1041                           break;   1059                           break;
1042                   case TAG_DIGITAL_ZOOM_RATIO:   1060                   case TAG_DIGITAL_ZOOM_RATIO:
1043                           $tmp = $this->ImageInfo['h']["zoomRatio"] = $this->ConvertAnyFormat($ValuePtr, $Format);   1061                           $tmp = $this->ImageInfo['h']["zoomRatio"] = $this->ConvertAnyFormat($ValuePtr, $Format);
1044                           $this->ImageInfo['h']["zoomRatio"] = sprintf("%4.2f (%d/%d)",(double)$tmp[0],$tmp[1][0],$tmp[1][1]);   1062                           $this->ImageInfo['h']["zoomRatio"] = sprintf("%4.2f (%d/%d)",(double)$tmp[0],$tmp[1][0],$tmp[1][1]);
(459 unchanged lines omitted)
1504               return ($this->cpgGetMicroTime() - $this->timeStart);   1522               return ($this->cpgGetMicroTime() - $this->timeStart);
1505       }   1523       }
1506   } // end of class   1524   } // end of class
1507   ?>   1525   ?>