Roll pdfium. This brings in:

Roll pdfium. This brings in:

8f75c67  Disable warning 4267 in pdfium until it is fixed.
e76e823  Remove unused variable orig_size.
3d07b6f  Do not disable warnings-as-errors for pdfium.

BUG=375114
R=thestig@chromium.org
TBR=thestig@chromium.org

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=283628

[Lei Zhang, 2014-07-16 22:51:45]

lgtm and woot

[Nico, 2014-07-16 22:54:54]

The CQ bit was checked by thakis@chromium.org

[commit-bot: I haz the power, 2014-07-16 23:00:36]

CQ is trying da patch. Follow status at
 https://chromium-status.appspot.com/cq/thakis@chromium.org/400483002/1

[Nico, 2014-07-17 00:33:08]

Now rolls in
https://pdfium.googlesource.com/pdfium/+/8f75c67f4e724ba44eb3d90e4033f8cc9052...
too

[Nico, 2014-07-17 00:33:11]

The CQ bit was checked by thakis@chromium.org

[commit-bot: I haz the power, 2014-07-17 00:35:05]

CQ is trying da patch. Follow status at
 https://chromium-status.appspot.com/cq/thakis@chromium.org/400483002/20001

[Nico, 2014-07-17 03:50:36]

Committed patchset #2 manually as r283628 (presubmit successful).

[Yaron, 2014-07-17 17:46:04]

On 2014/07/17 03:50:36, Nico (away) wrote:
> Committed patchset #2 manually as r283628 (presubmit successful).

I'm seeing these errors locally:
../../third_party/pdfium/core/src/fpdfapi/fpdf_parser/../.././fxcodec/fx_zlib/zlib_v128/zlib.h:1782:13:
error: 'adler32_combine' macro redefined [-Werror,-Wmacro-redefined]
#    define adler32_combine adler32_combine64
            ^
../../third_party/pdfium/core/src/fpdfapi/fpdf_parser/../.././fxcodec/fx_zlib/zlib_v128/zlib.h:88:9:
note: previous definition is here
#define adler32_combine FPDFAPI_adler32_combine
        ^
../../third_party/pdfium/core/src/fpdfapi/fpdf_parser/../.././fxcodec/fx_zlib/zlib_v128/zlib.h:1783:13:
error: 'crc32_combine' macro redefined [-Werror,-Wmacro-redefined]
#    define crc32_combine crc32_combine64
            ^
../../third_party/pdfium/core/src/fpdfapi/fpdf_parser/../.././fxcodec/fx_zlib/zlib_v128/zlib.h:92:9:
note: previous definition is here
#define crc32_combine FPDFAPI_crc32_combine
        ^
so the build fails since this roll. Known issue?

[Nico, 2014-07-17 17:47:47]

On 2014/07/17 17:46:04, Yaron wrote:
> On 2014/07/17 03:50:36, Nico (away) wrote:
> > Committed patchset #2 manually as r283628 (presubmit successful).
> 
> I'm seeing these errors locally:
>
../../third_party/pdfium/core/src/fpdfapi/fpdf_parser/../.././fxcodec/fx_zlib/zlib_v128/zlib.h:1782:13:
> error: 'adler32_combine' macro redefined [-Werror,-Wmacro-redefined]
> #    define adler32_combine adler32_combine64
>             ^
>
../../third_party/pdfium/core/src/fpdfapi/fpdf_parser/../.././fxcodec/fx_zlib/zlib_v128/zlib.h:88:9:
> note: previous definition is here
> #define adler32_combine FPDFAPI_adler32_combine
>         ^
>
../../third_party/pdfium/core/src/fpdfapi/fpdf_parser/../.././fxcodec/fx_zlib/zlib_v128/zlib.h:1783:13:
> error: 'crc32_combine' macro redefined [-Werror,-Wmacro-redefined]
> #    define crc32_combine crc32_combine64
>             ^
>
../../third_party/pdfium/core/src/fpdfapi/fpdf_parser/../.././fxcodec/fx_zlib/zlib_v128/zlib.h:92:9:
> note: previous definition is here
> #define crc32_combine FPDFAPI_crc32_combine
>         ^
> so the build fails since this roll. Known issue?

No. Bots don't see this. What platform are you building for?

[Yaron, 2014-07-17 18:15:45]

On 2014/07/17 17:47:47, Nico (away) wrote:
> On 2014/07/17 17:46:04, Yaron wrote:
> > On 2014/07/17 03:50:36, Nico (away) wrote:
> > > Committed patchset #2 manually as r283628 (presubmit successful).
> > 
> > I'm seeing these errors locally:
> >
>
../../third_party/pdfium/core/src/fpdfapi/fpdf_parser/../.././fxcodec/fx_zlib/zlib_v128/zlib.h:1782:13:
> > error: 'adler32_combine' macro redefined [-Werror,-Wmacro-redefined]
> > #    define adler32_combine adler32_combine64
> >             ^
> >
>
../../third_party/pdfium/core/src/fpdfapi/fpdf_parser/../.././fxcodec/fx_zlib/zlib_v128/zlib.h:88:9:
> > note: previous definition is here
> > #define adler32_combine FPDFAPI_adler32_combine
> >         ^
> >
>
../../third_party/pdfium/core/src/fpdfapi/fpdf_parser/../.././fxcodec/fx_zlib/zlib_v128/zlib.h:1783:13:
> > error: 'crc32_combine' macro redefined [-Werror,-Wmacro-redefined]
> > #    define crc32_combine crc32_combine64
> >             ^
> >
>
../../third_party/pdfium/core/src/fpdfapi/fpdf_parser/../.././fxcodec/fx_zlib/zlib_v128/zlib.h:92:9:
> > note: previous definition is here
> > #define crc32_combine FPDFAPI_crc32_combine
> >         ^
> > so the build fails since this roll. Known issue?
> 
> No. Bots don't see this. What platform are you building for?

just seeing this locally on linux working station. building release tried clang
& gcc

[Yaron, 2014-07-17 18:15:56]

On 2014/07/17 18:15:45, Yaron wrote:
> On 2014/07/17 17:47:47, Nico (away) wrote:
> > On 2014/07/17 17:46:04, Yaron wrote:
> > > On 2014/07/17 03:50:36, Nico (away) wrote:
> > > > Committed patchset #2 manually as r283628 (presubmit successful).
> > > 
> > > I'm seeing these errors locally:
> > >
> >
>
../../third_party/pdfium/core/src/fpdfapi/fpdf_parser/../.././fxcodec/fx_zlib/zlib_v128/zlib.h:1782:13:
> > > error: 'adler32_combine' macro redefined [-Werror,-Wmacro-redefined]
> > > #    define adler32_combine adler32_combine64
> > >             ^
> > >
> >
>
../../third_party/pdfium/core/src/fpdfapi/fpdf_parser/../.././fxcodec/fx_zlib/zlib_v128/zlib.h:88:9:
> > > note: previous definition is here
> > > #define adler32_combine FPDFAPI_adler32_combine
> > >         ^
> > >
> >
>
../../third_party/pdfium/core/src/fpdfapi/fpdf_parser/../.././fxcodec/fx_zlib/zlib_v128/zlib.h:1783:13:
> > > error: 'crc32_combine' macro redefined [-Werror,-Wmacro-redefined]
> > > #    define crc32_combine crc32_combine64
> > >             ^
> > >
> >
>
../../third_party/pdfium/core/src/fpdfapi/fpdf_parser/../.././fxcodec/fx_zlib/zlib_v128/zlib.h:92:9:
> > > note: previous definition is here
> > > #define crc32_combine FPDFAPI_crc32_combine
> > >         ^
> > > so the build fails since this roll. Known issue?
> > 
> > No. Bots don't see this. What platform are you building for?
> 
> just seeing this locally on linux working station. building release tried
clang
> & gcc

and os=linux

[Nico, 2014-07-17 18:34:52]

Huh, I don't see this on my linux box with default gyp defines (except
use_goma=1). Do you have any local changes? Are you synced to trunk?

For me, zlib.h:1782 isn't compiled, I can put garbage there and things
still build. What's your ubuntu version?


On Thu, Jul 17, 2014 at 11:15 AM, <yfriedman@chromium.org> wrote:

> On 2014/07/17 18:15:45, Yaron wrote:
>
>> On 2014/07/17 17:47:47, Nico (away) wrote:
>> > On 2014/07/17 17:46:04, Yaron wrote:
>> > > On 2014/07/17 03:50:36, Nico (away) wrote:
>> > > > Committed patchset #2 manually as r283628 (presubmit successful).
>> > >
>> > > I'm seeing these errors locally:
>> > >
>> >
>>
>
> ../../third_party/pdfium/core/src/fpdfapi/fpdf_parser/../../
> ./fxcodec/fx_zlib/zlib_v128/zlib.h:1782:13:
>
>> > > error: 'adler32_combine' macro redefined [-Werror,-Wmacro-redefined]
>> > > #    define adler32_combine adler32_combine64
>> > >             ^
>> > >
>> >
>>
>
> ../../third_party/pdfium/core/src/fpdfapi/fpdf_parser/../../
> ./fxcodec/fx_zlib/zlib_v128/zlib.h:88:9:
>
>> > > note: previous definition is here
>> > > #define adler32_combine FPDFAPI_adler32_combine
>> > >         ^
>> > >
>> >
>>
>
> ../../third_party/pdfium/core/src/fpdfapi/fpdf_parser/../../
> ./fxcodec/fx_zlib/zlib_v128/zlib.h:1783:13:
>
>> > > error: 'crc32_combine' macro redefined [-Werror,-Wmacro-redefined]
>> > > #    define crc32_combine crc32_combine64
>> > >             ^
>> > >
>> >
>>
>
> ../../third_party/pdfium/core/src/fpdfapi/fpdf_parser/../../
> ./fxcodec/fx_zlib/zlib_v128/zlib.h:92:9:
>
>> > > note: previous definition is here
>> > > #define crc32_combine FPDFAPI_crc32_combine
>> > >         ^
>> > > so the build fails since this roll. Known issue?
>> >
>> > No. Bots don't see this. What platform are you building for?
>>
>
>  just seeing this locally on linux working station. building release tried
>>
> clang
>
>> & gcc
>>
>
> and os=linux
>
> https://codereview.chromium.org/400483002/
>

To unsubscribe from this group and stop receiving emails from it, send an email
to chromium-reviews+unsubscribe@chromium.org.

[Yaron, 2014-07-17 18:47:53]

On 2014/07/17 18:34:52, Nico (away) wrote:
> Huh, I don't see this on my linux box with default gyp defines (except
> use_goma=1). Do you have any local changes? Are you synced to trunk?
> 
> For me, zlib.h:1782 isn't compiled, I can put garbage there and things
> still build. What's your ubuntu version?
> 
> 
> On Thu, Jul 17, 2014 at 11:15 AM, <mailto:yfriedman@chromium.org> wrote:
> 
> > On 2014/07/17 18:15:45, Yaron wrote:
> >
> >> On 2014/07/17 17:47:47, Nico (away) wrote:
> >> > On 2014/07/17 17:46:04, Yaron wrote:
> >> > > On 2014/07/17 03:50:36, Nico (away) wrote:
> >> > > > Committed patchset #2 manually as r283628 (presubmit successful).
> >> > >
> >> > > I'm seeing these errors locally:
> >> > >
> >> >
> >>
> >
> > ../../third_party/pdfium/core/src/fpdfapi/fpdf_parser/../../
> > ./fxcodec/fx_zlib/zlib_v128/zlib.h:1782:13:
> >
> >> > > error: 'adler32_combine' macro redefined [-Werror,-Wmacro-redefined]
> >> > > #    define adler32_combine adler32_combine64
> >> > >             ^
> >> > >
> >> >
> >>
> >
> > ../../third_party/pdfium/core/src/fpdfapi/fpdf_parser/../../
> > ./fxcodec/fx_zlib/zlib_v128/zlib.h:88:9:
> >
> >> > > note: previous definition is here
> >> > > #define adler32_combine FPDFAPI_adler32_combine
> >> > >         ^
> >> > >
> >> >
> >>
> >
> > ../../third_party/pdfium/core/src/fpdfapi/fpdf_parser/../../
> > ./fxcodec/fx_zlib/zlib_v128/zlib.h:1783:13:
> >
> >> > > error: 'crc32_combine' macro redefined [-Werror,-Wmacro-redefined]
> >> > > #    define crc32_combine crc32_combine64
> >> > >             ^
> >> > >
> >> >
> >>
> >
> > ../../third_party/pdfium/core/src/fpdfapi/fpdf_parser/../../
> > ./fxcodec/fx_zlib/zlib_v128/zlib.h:92:9:
> >
> >> > > note: previous definition is here
> >> > > #define crc32_combine FPDFAPI_crc32_combine
> >> > >         ^
> >> > > so the build fails since this roll. Known issue?
> >> >
> >> > No. Bots don't see this. What platform are you building for?
> >>
> >
> >  just seeing this locally on linux working station. building release tried
> >>
> > clang
> >
> >> & gcc
> >>
> >
> > and os=linux
> >
> > https://codereview.chromium.org/400483002/
> >
> 
> To unsubscribe from this group and stop receiving emails from it, send an
email
> to mailto:chromium-reviews+unsubscribe@chromium.org.

Tried flipping gyp flags. It appears to be from using cjhopman's magic library:
https://github.com/cjhopman/magic-debugging

sorry for the false alarm. i'll talk to him