Skip to content

Updated protobuf version to 3.5.1#10595

Merged
opencv-pushbot merged 4 commits intoopencv:masterfrom
oqtvs:updateProtobuf
Jan 16, 2018
Merged

Updated protobuf version to 3.5.1#10595
opencv-pushbot merged 4 commits intoopencv:masterfrom
oqtvs:updateProtobuf

Conversation

@oqtvs
Copy link
Copy Markdown
Contributor

@oqtvs oqtvs commented Jan 15, 2018 •
edited by alalek
Loading

resolves #10510

This pullrequest changes

This pull request changes the version of dnn's protobuf from 3.1.0 to 3.5.1

allow_multiple_commits=1

@oqtvs
Copy link
Copy Markdown
Contributor Author

oqtvs commented Jan 15, 2018

Will just solve this conflicts maybe with a rebase

@oqtvs
Copy link
Copy Markdown
Contributor Author

oqtvs commented Jan 15, 2018 •
edited
Loading

Just updating here
Windows builds and docs aren't building for now, the error is:

Creating library C:/build/precommit_opencl/build/lib/Release/opencv_dnn340.lib and object C:/build/precommit_opencl/build/lib/Release/opencv_dnn340.exp
   319>libprotobuf.lib(zero_copy_stream_impl.obj) : error LNK2019: unresolved external symbol "int __cdecl google::protobuf::internal::win32::close(int)" (?close@win32@internal@protobuf@google@@YAHH@Z) referenced in function "public: bool __cdecl google::protobuf::io::FileInputStream::CopyingFileInputStream::Close(void)" (?Close@CopyingFileInputStream@FileInputStream@io@protobuf@google@@QEAA_NXZ) [C:\build\precommit_opencl\build\modules\dnn\opencv_dnn.vcxproj]
   319>libprotobuf.lib(zero_copy_stream_impl.obj) : error LNK2019: unresolved external symbol "int __cdecl google::protobuf::internal::win32::read(int,void *,unsigned __int64)" (?read@win32@internal@protobuf@google@@YAHHPEAX_K@Z) referenced in function "public: virtual int __cdecl google::protobuf::io::FileInputStream::CopyingFileInputStream::Read(void *,int)" (?Read@CopyingFileInputStream@FileInputStream@io@protobuf@google@@UEAAHPEAXH@Z) [C:\build\precommit_opencl\build\modules\dnn\opencv_dnn.vcxproj]
   319>libprotobuf.lib(zero_copy_stream_impl.obj) : error LNK2019: unresolved external symbol "int __cdecl google::protobuf::internal::win32::write(int,void const *,unsigned __int64)" (?write@win32@internal@protobuf@google@@YAHHPEBX_K@Z) referenced in function "public: virtual bool __cdecl google::protobuf::io::FileOutputStream::CopyingFileOutputStream::Write(void const *,int)" (?Write@CopyingFileOutputStream@FileOutputStream@io@protobuf@google@@UEAA_NPEBXH@Z) [C:\build\precommit_opencl\build\modules\dnn\opencv_dnn.vcxproj]
   319>C:\build\precommit_opencl\build\bin\Release\opencv_dnn340.dll : fatal error LNK1120: 3 unresolved externals [C:\build\precommit_opencl\build\modules\dnn\opencv_dnn.vcxproj]
   319>Done Building Project "C:\build\precommit_opencl\build\modules\dnn\opencv_dnn.vcxproj" (default targets) -- FAILED.
     1>Project "C:\build\precommit_opencl\build\ALL_BUILD.vcxproj" (1) is building "C:\build\precommit_opencl\build\modules\core\opencv_test_core.vcxproj" (351) on node 3 (default targets).

Need to spend some time to check what is missing.

About the errors on the doc build i didn't understand, it is because of the trailing whitespace.?

@oqtvs oqtvs force-pushed the updateProtobuf branch 2 times, most recently from c66f2ed to ef33b49 Compare January 15, 2018 14:47
@alalek
Copy link
Copy Markdown
Member

alalek commented Jan 15, 2018

@oqtvs Thank you! I will take a look on these issues.

@oqtvs
Copy link
Copy Markdown
Contributor Author

oqtvs commented Jan 15, 2018

@alalek I have looked into it and it was a io_win32.cpp file that was missing on cmakefile, now mainly problem with trailing whitespace and warnings.

@oqtvs
Copy link
Copy Markdown
Contributor Author

oqtvs commented Jan 15, 2018 •
edited by alalek
Loading

Fixed white-space problems, now mainly warnings,
One of them i found a solution on protobuf's repo:
-Wno-invalid-offsetof was used as solution for invalid offset warning on protocolbuffers/protobuf#3450 ( Wrote a note on protobuf build cmakefile )
But i think it is better to look with caution into them and see what effects they have.

@alalek
Copy link
Copy Markdown
Member

alalek commented Jan 16, 2018

I pushed an update, please take a look.

@oqtvs
Copy link
Copy Markdown
Contributor Author

oqtvs commented Jan 16, 2018

@alalek it looks good to me(builded locally and it is working)! The only question that remained to me was if the solution of suppressing the warnings: /wd4701 /wd4703 -Winvalid-offsetof was right (meaning that it isn't a bug on libprotobuf?) I haven't had the time to look into it. But besides my doubt everything is ok.

alalek
alalek approved these changes Jan 16, 2018
View reviewed changes
Copy link
Copy Markdown
Member

@alalek alalek left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you!

@alalek
Copy link
Copy Markdown
Member

alalek commented Jan 16, 2018

@oqtvs These warnings doesn't point on serious bug in protobuf.

@opencv-pushbot opencv-pushbot merged commit 22816a4 into opencv:master Jan 16, 2018
opencv-pushbot pushed a commit that referenced this pull request Jan 16, 2018
@alalek
Merge pull request #10595 from oqtvs:updateProtobuf
cbb21f3
@oqtvs
Copy link
Copy Markdown
Contributor Author

oqtvs commented Jan 16, 2018

Ok perfect! Thanks @alalek =)

@alalek alalek mentioned this pull request Jan 17, 2018
Merged
@alalek alalek mentioned this pull request Feb 28, 2018
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@alalek alalek alalek approved these changes

Assignees

@alalek alalek

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

protobuf: build issue

3 participants

@oqtvs @alalek @opencv-pushbot