Merge tag 'v1.9.22' into 2.0-with-1.9.22-202207161647

# Conflicts:
#	README.md
#	src/GetID3.php
#	src/Module/Archive/Zip.php
#	src/Module/Audio/Aac.php
#	src/Module/AudioVideo/Asf.php
#	src/Module/AudioVideo/QuickTime.php
#	src/Module/Graphic/Gif.php
#	src/Utils.php

readme.txt

@@ -188,8 +188,8 @@ if ($fp_remote = fopen($remotefilename, 'rb')) {
 		$remote_headers = array_change_key_case(get_headers($remotefilename, 1), CASE_LOWER);
 		$remote_filesize = (isset($remote_headers['content-length']) ? (is_array($remote_headers['content-length']) ? $remote_headers['content-length'][count($remote_headers['content-length']) - 1] : $remote_headers['content-length']) : null);
 
-		// Initialize getID3 engine
-		$getID3 = new getID3;
+		// Initialize GetID3 engine
+		$getID3 = new GetID3;
 
 		$ThisFileInfo = $getID3->analyze($localtempfilename, $remote_filesize, basename($remotefilename));
 

src/Module/AudioVideo/QuickTime.php

@@ -1517,7 +1517,7 @@ public function QuicktimeParseAtom($atomname, $atomsize, $atom_data, $baseoffset
 						$OldAVDataEnd         = $info['avdataend'];
 						$info['avdataend']    = $atom_structure['offset'] + $atom_structure['size']; // $info['quicktime'][$atomname]['offset'] + $info['quicktime'][$atomname]['size'];
 
-						$getid3_temp = new getID3();
+						$getid3_temp = new GetID3();
 						$getid3_temp->openfile($this->getid3->filename, $this->getid3->info['filesize'], $this->getid3->fp);
 						$getid3_temp->info['avdataoffset'] = $info['avdataoffset'];
 						$getid3_temp->info['avdataend']    = $info['avdataend'];
@@ -1552,7 +1552,7 @@ public function QuicktimeParseAtom($atomname, $atomsize, $atom_data, $baseoffset
 					break;
 
 				case 'ID32': // ID3v2
-					$getid3_temp = new getID3();
+					$getid3_temp = new GetID3();
 					$getid3_temp->openfile($this->getid3->filename, $this->getid3->info['filesize'], $this->getid3->fp);
 					$getid3_id3v2 = new ID3v2($getid3_temp);
 					$getid3_id3v2->StartingOffset = $atom_structure['offset'] + 14; // framelength(4)+framename(4)+flags(4)+??(2)

src/Module/AudioVideo/Riff.php

@@ -2158,7 +2158,7 @@ public static function ParseBITMAPINFOHEADER($BITMAPINFOHEADER, $littleEndian=tr
 		$parsed['biYPelsPerMeter'] = substr($BITMAPINFOHEADER, 28, 4); // vertical resolution, in pixels per metre, of the target device
 		$parsed['biClrUsed']       = substr($BITMAPINFOHEADER, 32, 4); // actual number of color indices in the color table used by the bitmap. If this value is zero, the bitmap uses the maximum number of colors corresponding to the value of the biBitCount member for the compression mode specified by biCompression
 		$parsed['biClrImportant']  = substr($BITMAPINFOHEADER, 36, 4); // number of color indices that are considered important for displaying the bitmap. If this value is zero, all colors are important
-		$parsed = array_map('Utils::'.($littleEndian ? 'Little' : 'Big').'Endian2Int', $parsed);
+		$parsed = array_map('JamesHeinrich\\GetID3\\Utils::'.($littleEndian ? 'Little' : 'Big').'Endian2Int', $parsed);
 
 		$parsed['fourcc']          = substr($BITMAPINFOHEADER, 16, 4);  // compression identifier