|
|
Created:
4 years, 9 months ago by robertphillips Modified:
4 years, 9 months ago CC:
reviews_skia.org, mtklein, yujieqin, msarett, scroggo Base URL:
https://skia.googlesource.com/skia.git@master Target Ref:
refs/heads/master Project:
skia Visibility:
Public. |
DescriptionPartial revert of https://codereview.chromium.org/1738913002/ (Enable RAW codec for Windows)
This un-breaks the MSVC 2015 build.
Committed: https://skia.googlesource.com/skia/+/40ee60cee1d9e225263e70cd3372de6010c98a4f
Patch Set 1 #Patch Set 2 : Let's try that again #Messages
Total messages: 22 (13 generated)
Description was changed from ========== Partial revert of https://codereview.chromium.org/1738913002/ (Enable RAW codec for Windows) ========== to ========== Partial revert of https://codereview.chromium.org/1738913002/ (Enable RAW codec for Windows) GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&is... ==========
Description was changed from ========== Partial revert of https://codereview.chromium.org/1738913002/ (Enable RAW codec for Windows) GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&is... ========== to ========== Partial revert of https://codereview.chromium.org/1738913002/ (Enable RAW codec for Windows) GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&is... ==========
robertphillips@google.com changed reviewers: + bsalomon@google.com
Description was changed from ========== Partial revert of https://codereview.chromium.org/1738913002/ (Enable RAW codec for Windows) GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&is... ========== to ========== Partial revert of https://codereview.chromium.org/1738913002/ (Enable RAW codec for Windows) This un-breaks the MSVC 2015 build. GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&is... ==========
lgtm
The CQ bit was checked by robertphillips@google.com to run a CQ dry run
Dry run: CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1753243003/20001 View timeline at https://chromium-cq-status.appspot.com/patch-timeline/1753243003/20001
Description was changed from ========== Partial revert of https://codereview.chromium.org/1738913002/ (Enable RAW codec for Windows) This un-breaks the MSVC 2015 build. GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&is... ========== to ========== Partial revert of https://codereview.chromium.org/1738913002/ (Enable RAW codec for Windows) This un-breaks the MSVC 2015 build. The dng_sdk library is generating a lot of warnings and errors. Here is a partial log: 1>C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\include\xmemory0(874): error C2664: 'dng_std_allocator<_Newfirst>::dng_std_allocator(const dng_std_allocator<_Newfirst> &)': cannot convert argument 1 from 'std::_Wrap_alloc<dng_std_allocator<dng_noise_function>>' to 'const dng_std_allocator<_Newfirst> &' 1> with 1> [ 1> _Newfirst=std::_Container_proxy 1> ] (compiling source file ..\..\third_party\externals\dng_sdk\source\dng_color_spec.cpp) 1> C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\include\xmemory0(874): note: Reason: cannot convert from 'std::_Wrap_alloc<dng_std_allocator<dng_noise_function>>' to 'const dng_std_allocator<_Newfirst>' 1> with 1> [ 1> _Newfirst=std::_Container_proxy 1> ] (compiling source file ..\..\third_party\externals\dng_sdk\source\dng_color_spec.cpp) 1> C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\include\xmemory0(874): note: No user-defined-conversion operator available that can perform this conversion, or the operator cannot be called (compiling source file ..\..\third_party\externals\dng_sdk\source\dng_color_spec.cpp) 1> C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\include\vector(587): note: see reference to function template instantiation 'std::_Wrap_alloc<dng_std_allocator<_Newfirst>>::_Wrap_alloc<std::_Wrap_alloc<dng_std_allocator<dng_noise_function>>>(_Other &)' being compiled 1> with 1> [ 1> _Newfirst=std::_Container_proxy, 1> _Other=std::_Wrap_alloc<dng_std_allocator<dng_noise_function>> 1> ] (compiling source file ..\..\third_party\externals\dng_sdk\source\dng_color_spec.cpp) 1> C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\include\vector(587): note: see reference to function template instantiation 'std::_Wrap_alloc<dng_std_allocator<_Newfirst>>::_Wrap_alloc<std::_Wrap_alloc<dng_std_allocator<dng_noise_function>>>(_Other &)' being compiled 1> with 1> [ 1> _Newfirst=std::_Container_proxy, 1> _Other=std::_Wrap_alloc<dng_std_allocator<dng_noise_function>> 1> ] (compiling source file ..\..\third_party\externals\dng_sdk\source\dng_color_spec.cpp) 1> C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\include\vector(585): note: while compiling class template member function 'void std::_Vector_alloc<std::_Vec_base_types<_Ty,_Alloc>>::_Free_proxy(void)' 1> with 1> [ 1> _Ty=dng_noise_function, 1> _Alloc=dng_std_allocator<dng_noise_function> 1> ] (compiling source file ..\..\third_party\externals\dng_sdk\source\dng_color_spec.cpp) 1> C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\include\vector(557): note: see reference to function template instantiation 'void std::_Vector_alloc<std::_Vec_base_types<_Ty,_Alloc>>::_Free_proxy(void)' being compiled 1> with 1> [ 1> _Ty=dng_noise_function, 1> _Alloc=dng_std_allocator<dng_noise_function> 1> ] (compiling source file ..\..\third_party\externals\dng_sdk\source\dng_color_spec.cpp) GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&is... ==========
Description was changed from ========== Partial revert of https://codereview.chromium.org/1738913002/ (Enable RAW codec for Windows) This un-breaks the MSVC 2015 build. The dng_sdk library is generating a lot of warnings and errors. Here is a partial log: 1>C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\include\xmemory0(874): error C2664: 'dng_std_allocator<_Newfirst>::dng_std_allocator(const dng_std_allocator<_Newfirst> &)': cannot convert argument 1 from 'std::_Wrap_alloc<dng_std_allocator<dng_noise_function>>' to 'const dng_std_allocator<_Newfirst> &' 1> with 1> [ 1> _Newfirst=std::_Container_proxy 1> ] (compiling source file ..\..\third_party\externals\dng_sdk\source\dng_color_spec.cpp) 1> C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\include\xmemory0(874): note: Reason: cannot convert from 'std::_Wrap_alloc<dng_std_allocator<dng_noise_function>>' to 'const dng_std_allocator<_Newfirst>' 1> with 1> [ 1> _Newfirst=std::_Container_proxy 1> ] (compiling source file ..\..\third_party\externals\dng_sdk\source\dng_color_spec.cpp) 1> C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\include\xmemory0(874): note: No user-defined-conversion operator available that can perform this conversion, or the operator cannot be called (compiling source file ..\..\third_party\externals\dng_sdk\source\dng_color_spec.cpp) 1> C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\include\vector(587): note: see reference to function template instantiation 'std::_Wrap_alloc<dng_std_allocator<_Newfirst>>::_Wrap_alloc<std::_Wrap_alloc<dng_std_allocator<dng_noise_function>>>(_Other &)' being compiled 1> with 1> [ 1> _Newfirst=std::_Container_proxy, 1> _Other=std::_Wrap_alloc<dng_std_allocator<dng_noise_function>> 1> ] (compiling source file ..\..\third_party\externals\dng_sdk\source\dng_color_spec.cpp) 1> C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\include\vector(587): note: see reference to function template instantiation 'std::_Wrap_alloc<dng_std_allocator<_Newfirst>>::_Wrap_alloc<std::_Wrap_alloc<dng_std_allocator<dng_noise_function>>>(_Other &)' being compiled 1> with 1> [ 1> _Newfirst=std::_Container_proxy, 1> _Other=std::_Wrap_alloc<dng_std_allocator<dng_noise_function>> 1> ] (compiling source file ..\..\third_party\externals\dng_sdk\source\dng_color_spec.cpp) 1> C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\include\vector(585): note: while compiling class template member function 'void std::_Vector_alloc<std::_Vec_base_types<_Ty,_Alloc>>::_Free_proxy(void)' 1> with 1> [ 1> _Ty=dng_noise_function, 1> _Alloc=dng_std_allocator<dng_noise_function> 1> ] (compiling source file ..\..\third_party\externals\dng_sdk\source\dng_color_spec.cpp) 1> C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\include\vector(557): note: see reference to function template instantiation 'void std::_Vector_alloc<std::_Vec_base_types<_Ty,_Alloc>>::_Free_proxy(void)' being compiled 1> with 1> [ 1> _Ty=dng_noise_function, 1> _Alloc=dng_std_allocator<dng_noise_function> 1> ] (compiling source file ..\..\third_party\externals\dng_sdk\source\dng_color_spec.cpp) GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&is... ========== to ========== Partial revert of https://codereview.chromium.org/1738913002/ (Enable RAW codec for Windows) This un-breaks the MSVC 2015 build. ==========
The dng_sdk library is generating a lot of warnings and errors. Here is a partial log: 1>C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\include\xmemory0(874): error C2664: 'dng_std_allocator<_Newfirst>::dng_std_allocator(const dng_std_allocator<_Newfirst> &)': cannot convert argument 1 from 'std::_Wrap_alloc<dng_std_allocator<dng_noise_function>>' to 'const dng_std_allocator<_Newfirst> &' 1> with 1> [ 1> _Newfirst=std::_Container_proxy 1> ] (compiling source file ..\..\third_party\externals\dng_sdk\source\dng_color_spec.cpp) 1> C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\include\xmemory0(874): note: Reason: cannot convert from 'std::_Wrap_alloc<dng_std_allocator<dng_noise_function>>' to 'const dng_std_allocator<_Newfirst>' 1> with 1> [ 1> _Newfirst=std::_Container_proxy 1> ] (compiling source file ..\..\third_party\externals\dng_sdk\source\dng_color_spec.cpp) 1> C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\include\xmemory0(874): note: No user-defined-conversion operator available that can perform this conversion, or the operator cannot be called (compiling source file ..\..\third_party\externals\dng_sdk\source\dng_color_spec.cpp) 1> C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\include\vector(587): note: see reference to function template instantiation 'std::_Wrap_alloc<dng_std_allocator<_Newfirst>>::_Wrap_alloc<std::_Wrap_alloc<dng_std_allocator<dng_noise_function>>>(_Other &)' being compiled 1> with 1> [ 1> _Newfirst=std::_Container_proxy, 1> _Other=std::_Wrap_alloc<dng_std_allocator<dng_noise_function>> 1> ] (compiling source file ..\..\third_party\externals\dng_sdk\source\dng_color_spec.cpp) 1> C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\include\vector(587): note: see reference to function template instantiation 'std::_Wrap_alloc<dng_std_allocator<_Newfirst>>::_Wrap_alloc<std::_Wrap_alloc<dng_std_allocator<dng_noise_function>>>(_Other &)' being compiled 1> with 1> [ 1> _Newfirst=std::_Container_proxy, 1> _Other=std::_Wrap_alloc<dng_std_allocator<dng_noise_function>> 1> ] (compiling source file ..\..\third_party\externals\dng_sdk\source\dng_color_spec.cpp) 1> C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\include\vector(585): note: while compiling class template member function 'void std::_Vector_alloc<std::_Vec_base_types<_Ty,_Alloc>>::_Free_proxy(void)' 1> with 1> [ 1> _Ty=dng_noise_function, 1> _Alloc=dng_std_allocator<dng_noise_function> 1> ] (compiling source file ..\..\third_party\externals\dng_sdk\source\dng_color_spec.cpp) 1> C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\include\vector(557): note: see reference to function template instantiation 'void std::_Vector_alloc<std::_Vec_base_types<_Ty,_Alloc>>::_Free_proxy(void)' being compiled 1> with 1> [ 1> _Ty=dng_noise_function, 1> _Alloc=dng_std_allocator<dng_noise_function> 1> ] (compiling source file ..\..\third_party\externals\dng_sdk\source\dng_color_spec.cpp) . . . 1> dng_stream.cpp 1>..\..\third_party\externals\dng_sdk\source\dng_pthread.cpp(666): error C2079: 'sys_timespec' uses undefined struct 'dng_timespec' 1>..\..\third_party\externals\dng_sdk\source\dng_pthread.cpp(668): error C2664: 'int dng_pthread_now(dng_timespec *)': cannot convert argument 1 from 'int *' to 'dng_timespec *' 1> ..\..\third_party\externals\dng_sdk\source\dng_pthread.cpp(668): note: Types pointed to are unrelated; conversion requires reinterpret_cast, C-style cast or function-style cast 1>..\..\third_party\externals\dng_sdk\source\dng_pthread.cpp(670): error C2228: left of '.tv_sec' must have class/struct/union 1> ..\..\third_party\externals\dng_sdk\source\dng_pthread.cpp(670): note: type is 'int' 1>..\..\third_party\externals\dng_sdk\source\dng_pthread.cpp(670): error C2228: left of '.tv_nsec' must have class/struct/union 1> ..\..\third_party\externals\dng_sdk\source\dng_pthread.cpp(670): note: type is 'int' 1>..\..\third_party\externals\dng_sdk\source\dng_pthread.cpp(671): error C2027: use of undefined type 'dng_timespec' 1> c:\src\skia.2\third_party\externals\dng_sdk\source\dng_pthread.h(65): note: see declaration of 'dng_timespec' 1>..\..\third_party\externals\dng_sdk\source\dng_pthread.cpp(671): error C2227: left of '->tv_sec' must point to class/struct/union/generic type 1>..\..\third_party\externals\dng_sdk\source\dng_pthread.cpp(671): error C2227: left of '->tv_nsec' must point to class/struct/union/generic type 1>..\..\third_party\externals\dng_sdk\source\dng_pthread.cpp(1118): error C2027: use of undefined type 'dng_timespec' 1> c:\src\skia.2\third_party\externals\dng_sdk\source\dng_pthread.h(65): note: see declaration of 'dng_timespec' 1>..\..\third_party\externals\dng_sdk\source\dng_pthread.cpp(1118): error C2227: left of '->tv_sec' must point to class/struct/union/generic type 1>..\..\third_party\externals\dng_sdk\source\dng_pthread.cpp(1119): error C2027: use of undefined type 'dng_timespec' 1> c:\src\skia.2\third_party\externals\dng_sdk\source\dng_pthread.h(65): note: see declaration of 'dng_timespec' 1>..\..\third_party\externals\dng_sdk\source\dng_pthread.cpp(1119): error C2227: left of '->tv_nsec' must point to class/struct/union/generic type 1> dng_string.cpp 1>C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\include\xmemory0(874): error C2664: 'dng_std_allocator<_Newfirst>::dng_std_allocator(const dng_std_allocator<_Newfirst> &)': cannot convert argument 1 from 'std::_Wrap_alloc<dng_std_allocator<dng_noise_function>>' to 'const dng_std_allocator<_Newfirst> &' 1> with 1> [ 1> _Newfirst=std::_Container_proxy 1> ] (compiling source file ..\..\third_party\externals\dng_sdk\source\dng_read_image.cpp) 1> C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\include\xmemory0(874): note: Reason: cannot convert from 'std::_Wrap_alloc<dng_std_allocator<dng_noise_function>>' to 'const dng_std_allocator<_Newfirst>' 1> with 1> [ 1> _Newfirst=std::_Container_proxy 1> ] (compiling source file ..\..\third_party\externals\dng_sdk\source\dng_read_image.cpp)
msarett@google.com changed reviewers: + msarett@google.com
We should have a bot running MSVS 2015.
scroggo@google.com changed reviewers: + borenet@google.com, scroggo@google.com
On 2016/03/02 15:58:51, msarett wrote: > We should have a bot running MSVS 2015. +1 Eric, would it be possible to add a bot with MSVS 2015? (Or to upgrade from 2013, which I think is what we are currently using?)
The CQ bit was unchecked by robertphillips@google.com
The CQ bit was checked by robertphillips@google.com
The patchset sent to the CQ was uploaded after l-g-t-m from bsalomon@google.com Link to the patchset: https://codereview.chromium.org/1753243003/#ps20001 (title: "Let's try that again")
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1753243003/20001 View timeline at https://chromium-cq-status.appspot.com/patch-timeline/1753243003/20001
On 2016/03/02 16:01:06, scroggo wrote: > On 2016/03/02 15:58:51, msarett wrote: > > We should have a bot running MSVS 2015. > > +1 > > Eric, would it be possible to add a bot with MSVS 2015? (Or to upgrade from > 2013, which I think is what we are currently using?) It's on the list: https://bugs.chromium.org/p/skia/issues/detail?id=4553. Just haven't gotten to it yet.
Message was sent while issue was closed.
Description was changed from ========== Partial revert of https://codereview.chromium.org/1738913002/ (Enable RAW codec for Windows) This un-breaks the MSVC 2015 build. ========== to ========== Partial revert of https://codereview.chromium.org/1738913002/ (Enable RAW codec for Windows) This un-breaks the MSVC 2015 build. Committed: https://skia.googlesource.com/skia/+/40ee60cee1d9e225263e70cd3372de6010c98a4f ==========
Message was sent while issue was closed.
Committed patchset #2 (id:20001) as https://skia.googlesource.com/skia/+/40ee60cee1d9e225263e70cd3372de6010c98a4f |