diff options
| author | spiderr <spider@viovio.com> | 2011-10-17 15:44:34 -0400 |
|---|---|---|
| committer | spiderr <spider@viovio.com> | 2011-10-17 15:44:34 -0400 |
| commit | 2f0ebd276cb08ed242a62a8fedb4ed3a54b4212e (patch) | |
| tree | 4740d0aebd1c65198c9d118c35b83e0a90d5ee8d | |
| parent | ec1b41e1f623b3f5b42f7b0a3c344c63998a8ef5 (diff) | |
| download | util-2f0ebd276cb08ed242a62a8fedb4ed3a54b4212e.tar.gz util-2f0ebd276cb08ed242a62a8fedb4ed3a54b4212e.tar.bz2 util-2f0ebd276cb08ed242a62a8fedb4ed3a54b4212e.zip | |
quiet jpeg_metadata_tk/EXIF.php unpack warnings
| -rw-r--r-- | jpeg_metadata_tk/EXIF.php | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/jpeg_metadata_tk/EXIF.php b/jpeg_metadata_tk/EXIF.php index 4e74906..8751dcd 100644 --- a/jpeg_metadata_tk/EXIF.php +++ b/jpeg_metadata_tk/EXIF.php @@ -2216,6 +2216,8 @@ function interpret_IFD( $IFD_array, $filename ) function get_IFD_Data_Type( $input_data, $data_type, $Byte_Align ) { + $value = NULL; + if( !empty( $input_data ) ) { // Check if this is a Unsigned Byte, Unsigned Short or Unsigned Long if (( $data_type == 1 ) || ( $data_type == 3 ) || ( $data_type == 4 )) { @@ -2321,13 +2323,13 @@ function get_IFD_Data_Type( $input_data, $data_type, $Byte_Align ) { // Motorola MSB first byte aligment // Unpack the Numerator and denominator - $value = unpack( 'NNumerator/NDenominator', $input_data ); + $value = @unpack( 'NNumerator/NDenominator', $input_data ); } else { // Intel LSB first byte aligment // Unpack the Numerator and denominator - $value = unpack( 'VNumerator/VDenominator', $input_data ); + $value = @unpack( 'VNumerator/VDenominator', $input_data ); } // Convert the numerator to a signed number @@ -2369,6 +2371,9 @@ function get_IFD_Data_Type( $input_data, $data_type, $Byte_Align ) return "Invalid Datatype $data_type"; } + } else { + return "Invalid Datatype $data_type"; + } } |