Merge pull request #433 from lucienfostier/debugJPG

andrewkaufman · andrewkaufman · commit 3d4aff4690ba · 2015-06-09T09:00:49.000-07:00
Debug jpg
diff --git a/src/IECore/JPEGImageReader.cpp b/src/IECore/JPEGImageReader.cpp
@@ -95,7 +95,7 @@ bool JPEGImageReader::canRead( const string &fileName )
 	in.seekg(0, ios_base::beg);
 	in.read((char *) &magic, sizeof(unsigned int));
 
-	return magic == 0xe0ffd8ff || magic == 0xffd8ffe0 || magic == 0xe1ffd8ff || magic == 0xffd8ffe1 ;
+	return magic == 0xe0ffd8ff || magic == 0xffd8ffe0 || magic == 0xe1ffd8ff || magic == 0xffd8ffe1 || magic == 0xdbffd8ff;
 }
 
 void JPEGImageReader::channelNames( vector<string> &names )

Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,7 @@ bool JPEGImageReader::canRead( const string &fileName )`
`95`	`95`	`in.seekg(0, ios_base::beg);`
`96`	`96`	`in.read((char *) &magic, sizeof(unsigned int));`
`97`	`97`
`98`		`- return magic == 0xe0ffd8ff \|\| magic == 0xffd8ffe0 \|\| magic == 0xe1ffd8ff \|\| magic == 0xffd8ffe1 ;`
	`98`	`+ return magic == 0xe0ffd8ff \|\| magic == 0xffd8ffe0 \|\| magic == 0xe1ffd8ff \|\| magic == 0xffd8ffe1 \|\| magic == 0xdbffd8ff;`
`99`	`99`	`}`
`100`	`100`
`101`	`101`	`void JPEGImageReader::channelNames( vector<string> &names )`