Fix YUV horizontal and vertical sampling checks

Fix YUV horizontal and vertical sampling checks

The should fix crashes while decoding skps.

BUG=skia:4991
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1766523002

Committed: https://skia.googlesource.com/skia/+/7c87cf44cfc83d87be87d9a89ddb55394691149a

[msarett, 2016-03-04 00:31:59]

Description was changed from

==========
Fix YUV horizontal and vertical sampling checks

The should fix crashes while decoding skps.

BUG=skia:4991
==========

to

==========
Fix YUV horizontal and vertical sampling checks

The should fix crashes while decoding skps.

BUG=skia:4991
GOLD_TRYBOT_URL=
https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&is...
==========

[msarett, 2016-03-04 00:34:00]

msarett@google.com changed reviewers:
+ mtklein@google.com, rmistry@google.com, scroggo@google.com

[msarett, 2016-03-04 00:34:01]

https://codereview.chromium.org/1766523002/diff/1/src/codec/SkJpegCodec.cpp
File src/codec/SkJpegCodec.cpp (right):

https://codereview.chromium.org/1766523002/diff/1/src/codec/SkJpegCodec.cpp#n...
src/codec/SkJpegCodec.cpp:571: if  (!((1 == dinfo->comp_info[1].h_samp_factor)
&&
A couple characters makes a big difference :).

Whew I really needed an easy bug!

[mtklein, 2016-03-04 13:23:27]

https://codereview.chromium.org/1766523002/diff/1/src/codec/SkJpegCodec.cpp
File src/codec/SkJpegCodec.cpp (right):

https://codereview.chromium.org/1766523002/diff/1/src/codec/SkJpegCodec.cpp#n...
src/codec/SkJpegCodec.cpp:571: if  (!((1 == dinfo->comp_info[1].h_samp_factor)
&&
On 2016/03/04 00:34:01, msarett wrote:
> A couple characters makes a big difference :).
> 
> Whew I really needed an easy bug!

This may indicate we should De Morgan the logic?

if (1 != dinfo->comp_info[1].h_samp_factor ||
    1 != dinfo->comp_info[1].v_samp_factor ||
    1 != dinfo->comp_info[2].h_samp_factor ||
    1 != dinfo->comp_info[2].v_samp_factor) {
   return false;
}

[msarett, 2016-03-04 13:42:52]

https://codereview.chromium.org/1766523002/diff/1/src/codec/SkJpegCodec.cpp
File src/codec/SkJpegCodec.cpp (right):

https://codereview.chromium.org/1766523002/diff/1/src/codec/SkJpegCodec.cpp#n...
src/codec/SkJpegCodec.cpp:571: if  (!((1 == dinfo->comp_info[1].h_samp_factor)
&&
On 2016/03/04 13:23:27, mtklein wrote:
> On 2016/03/04 00:34:01, msarett wrote:
> > A couple characters makes a big difference :).
> > 
> > Whew I really needed an easy bug!
> 
> This may indicate we should De Morgan the logic?
> 
> if (1 != dinfo->comp_info[1].h_samp_factor ||
>     1 != dinfo->comp_info[1].v_samp_factor ||
>     1 != dinfo->comp_info[2].h_samp_factor ||
>     1 != dinfo->comp_info[2].v_samp_factor) {
>    return false;
> } 

Yeah I think that's clearer.

[mtklein, 2016-03-04 13:46:05]

lgtm

[msarett, 2016-03-04 14:13:14]

The CQ bit was checked by msarett@google.com

[commit-bot: I haz the power, 2016-03-04 14:13:18]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1766523002/20001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1766523002/20001

[commit-bot: I haz the power, 2016-03-04 14:23:23]

Description was changed from

==========
Fix YUV horizontal and vertical sampling checks

The should fix crashes while decoding skps.

BUG=skia:4991
GOLD_TRYBOT_URL=
https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&is...
==========

to

==========
Fix YUV horizontal and vertical sampling checks

The should fix crashes while decoding skps.

BUG=skia:4991
GOLD_TRYBOT_URL=
https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&is...

Committed:
https://skia.googlesource.com/skia/+/7c87cf44cfc83d87be87d9a89ddb55394691149a
==========

[commit-bot: I haz the power, 2016-03-04 14:23:24]

Committed patchset #2 (id:20001) as
https://skia.googlesource.com/skia/+/7c87cf44cfc83d87be87d9a89ddb55394691149a