Add more filetypes to DM's image tests.

Add more filetypes to DM's image tests.

ico, wbmp, plus the alternate suffix jpeg.

Also check for capitalized versions, since files sometimes use
capitalized suffixes.

BUG=skia:3235
Committed: https://skia.googlesource.com/skia/+/1d09ee7c04d635e93bb85d2e2ac39f445f5540aa

[scroggo, 2014-12-15 15:58:15]

scroggo@google.com changed reviewers:
+ mtklein@google.com

[mtklein, 2014-12-15 16:06:33]

https://codereview.chromium.org/798383003/diff/1/dm/DM.cpp
File dm/DM.cpp (right):

https://codereview.chromium.org/798383003/diff/1/dm/DM.cpp#newcode252
dm/DM.cpp:252: const char* suffixes[] = { "bmp", "gif", "jpg", "jpeg", "png",
"webp",
Why don't we just write
  const char* suffixes[] = {
    "bmp", "gif", "jpg", "jpeg", "png", "webp", "ktx", "astc", "wbmp", "ico",
    "BMP", "GIF", "JPG", "JPEG", "PNG", "WEBP", "KTX", "ASTC", "WBMP", "ICO",
  };
and call find_files() once?

[scroggo, 2014-12-15 16:16:00]

https://codereview.chromium.org/798383003/diff/1/dm/DM.cpp
File dm/DM.cpp (right):

https://codereview.chromium.org/798383003/diff/1/dm/DM.cpp#newcode252
dm/DM.cpp:252: const char* suffixes[] = { "bmp", "gif", "jpg", "jpeg", "png",
"webp",
On 2014/12/15 16:06:32, mtklein wrote:
> Why don't we just write
>   const char* suffixes[] = {
>     "bmp", "gif", "jpg", "jpeg", "png", "webp", "ktx", "astc", "wbmp", "ico",
>     "BMP", "GIF", "JPG", "JPEG", "PNG", "WEBP", "KTX", "ASTC", "WBMP", "ICO",
>   };
> and call find_files() once?

We could do that. (We did it in skimage.) The advantage to this approach is that
we reduce the chance of copy/forget error for the capitalized versions.

[scroggo, 2014-12-15 16:16:25]

On 2014/12/15 16:16:00, scroggo wrote:
> https://codereview.chromium.org/798383003/diff/1/dm/DM.cpp
> File dm/DM.cpp (right):
> 
> https://codereview.chromium.org/798383003/diff/1/dm/DM.cpp#newcode252
> dm/DM.cpp:252: const char* suffixes[] = { "bmp", "gif", "jpg", "jpeg", "png",
> "webp",
> On 2014/12/15 16:06:32, mtklein wrote:
> > Why don't we just write
> >   const char* suffixes[] = {
> >     "bmp", "gif", "jpg", "jpeg", "png", "webp", "ktx", "astc", "wbmp",
"ico",
> >     "BMP", "GIF", "JPG", "JPEG", "PNG", "WEBP", "KTX", "ASTC", "WBMP",
"ICO",
> >   };
> > and call find_files() once?
> 
> We could do that. (We did it in skimage.) The advantage to this approach is
that
> we reduce the chance of copy/forget error for the capitalized versions.

While adding the possibility of writing bad code.

[mtklein, 2014-12-15 16:22:05]

Seems hard to miss the lower/upper pairing when they're all lined up?

[scroggo, 2014-12-15 16:27:16]

On 2014/12/15 16:22:05, mtklein wrote:
> Seems hard to miss the lower/upper pairing when they're all lined up?

Done.

[mtklein, 2014-12-15 16:31:05]

https://codereview.chromium.org/798383003/diff/20001/dm/DM.cpp
File dm/DM.cpp (right):

https://codereview.chromium.org/798383003/diff/20001/dm/DM.cpp#newcode253
dm/DM.cpp:253: "bmp", "gif", "jpg", "jpeg", "png", "webp", "ktx", "astc",
"wbmp", "ico"
Gonna need a trailing comma after "ico" or we'll be really confused why we're
not reading .ico and .BMP files.  Might as well put it after "ICO" too.

[scroggo, 2014-12-15 16:33:52]

https://codereview.chromium.org/798383003/diff/20001/dm/DM.cpp
File dm/DM.cpp (right):

https://codereview.chromium.org/798383003/diff/20001/dm/DM.cpp#newcode253
dm/DM.cpp:253: "bmp", "gif", "jpg", "jpeg", "png", "webp", "ktx", "astc",
"wbmp", "ico"
On 2014/12/15 16:31:05, mtklein wrote:
> Gonna need a trailing comma after "ico" or we'll be really confused why we're
> not reading .ico and .BMP files.  Might as well put it after "ICO" too.

Done.

[mtklein, 2014-12-15 16:43:48]

The CQ bit was checked by mtklein@google.com

[mtklein, 2014-12-15 16:43:49]

lgtm

[commit-bot: I haz the power, 2014-12-15 16:44:18]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/798383003/40001

[commit-bot: I haz the power, 2014-12-15 16:53:38]

Committed patchset #3 (id:40001) as
https://skia.googlesource.com/skia/+/1d09ee7c04d635e93bb85d2e2ac39f445f5540aa