Skip to content

core(persistence): struct storage layout without alignment gaps#15050

Merged
opencv-pushbot merged 2 commits intoopencv:3.4from
alalek:core_fix_base64_packed_struct
Jul 18, 2019
Merged

core(persistence): struct storage layout without alignment gaps#15050
opencv-pushbot merged 2 commits intoopencv:3.4from
alalek:core_fix_base64_packed_struct

Conversation

@alalek
Copy link
Copy Markdown
Member

@alalek alalek commented Jul 15, 2019

Merge with extra: opencv/opencv_extra#636

relates #14977

Align with OpenCV 4.x rewritten implementation.
Rework tests.

allow_multiple_commits=1

alalek and others added 2 commits July 15, 2019 21:37
- writeRaw(): support structs
- readRaw(): 'len' is buffer limit in bytes (documentation is fixed)
);
if (!skip_message)
{
CV_LOG_WARNING(NULL, "Binary converter: struct storage layout has been changed in OpenCV 3.4.7. Alignment gaps has been removed from the storage containers. "
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Can we use CV_LOG_DEBUG and avoid introduction of new environment configuration parameter?

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

DEBUG messages are not compiled into release builds by default

@param vec Pointer to the destination array.
@param len Number of elements to read. If it is greater than number of remaining elements then all
of them will be read.
@param len Number of bytes to read (buffer size limit). If it is greater than number of
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Suggested change
@param len Number of bytes to read (buffer size limit). If it is greater than number of
@param len Number of bytes to read (buffer size limit). If it is greater than size of

@param vec Pointer to the destination array.
@param maxCount Number of elements to read. If it is greater than number of remaining elements then
all of them will be read.
@param len Number of bytes to read (buffer size limit). If it is greater than number of
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Suggested change
@param len Number of bytes to read (buffer size limit). If it is greater than number of
@param len Number of bytes to read (buffer size limit). If it is greater than size of

@opencv-pushbot opencv-pushbot merged commit 4ea8526 into opencv:3.4 Jul 18, 2019
@alalek alalek mentioned this pull request Jul 18, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants