port base64 encoding from 3.4 by rogday · Pull Request #20143 · opencv/opencv

rogday · 2021-05-24T08:24:02Z

opencv_extra=base64_encoding
force_builders=Custom,ARMv7
build_image:Custom=centos:7
buildworker:Custom=linux-1

rogday · 2021-06-03T16:55:28Z

modules/core/src/persistence.cpp

-            emitter->write("type_id", type_name, false);
-        }
-    }
+    if (fmt != FileStorage::FORMAT_JSON && !FileNode::isFlow(s.flags))


This somehow fixes JSON indentation mismatch with 3.4, but looks fragile.

alalek

Thank you for contribution!

alalek · 2021-06-25T07:53:59Z

modules/core/src/base64_encoding.cpp

+#include "persistence_impl.hpp"
+#include "base64_encoding.hpp"
+
+class base64::Base64ContextEmitter


license header

namespace cv

persistence_ prefix in filename

Thank you for review. Fixed

alalek · 2021-06-25T07:55:44Z

modules/core/src/base64_encoding.cpp

+class base64::Base64ContextEmitter
+{
+public:
+    explicit Base64ContextEmitter(cv::FileStorage::Impl * fs)


We need to add NULL check or prefer to pass as reference (C has pointers only):

cv::FileStorage::Impl& fs

As you suggested, I replaced pointer to reference.

alalek · 2021-06-25T07:57:02Z

modules/core/src/base64_encoding.cpp

+        if (src_cur != src_beg)
+            flush();    /* encode the rest binary data to base64 buffer */
+
+        if ( file_storage->fmt == cv::FileStorage::Mode::FORMAT_JSON )


JSON

In general, generic classes should not know about used format.

I removed JSON-specific actions from constructor and destructor( writing "$base64 and " to buffer) and added need_indent field instead.

alalek · 2021-06-25T07:58:30Z

modules/core/src/base64_encoding.cpp

+void base64::Base64Writer::check_dt(const char* dt)
+{
+    if ( dt == 0 )
+        CV_Error( CV_StsBadArg, "Invalid \'dt\'." );


CV_Sts...

Avoid using of legacy C API constants. Use Error::Sts... enum

alalek · 2021-06-25T08:02:53Z

modules/core/src/persistence_impl.hpp

+#ifndef OPENCV_CORE_PERSISTENCE_IMPL_HPP
+#define OPENCV_CORE_PERSISTENCE_IMPL_HPP
+
+#include "precomp.hpp"


precomp.hpp

must be used in .cpp files only (as unconditional first include)

alalek · 2021-06-25T08:05:52Z

modules/python/test/test_filestorage_io.py

+    def get_normal_2d_mat():
+        rows = 10
+        cols = 20
+        ch = 3


ch

cn is usually used in OpenCV code.

alalek · 2021-07-07T19:18:25Z

Is this PR still in WIP status? (as per PR title)

rogday · 2021-07-08T08:52:49Z

Is this PR still in WIP status? (as per PR title)

I squashed commits, changed the title, it's ready for merge.

rogday requested review from VadimLevin, asmorkalov and vpisarev May 24, 2021 08:24

rogday force-pushed the base64_encoding branch 3 times, most recently from 72651b4 to 2d17b0f Compare June 3, 2021 16:51

rogday commented Jun 3, 2021

View reviewed changes

rogday force-pushed the base64_encoding branch from a0fbc02 to bca4bb5 Compare June 7, 2021 14:23

rogday mentioned this pull request Jun 7, 2021

Add base64 test data opencv/opencv_extra#877

Merged

rogday force-pushed the base64_encoding branch 3 times, most recently from f9a281e to 430a3ee Compare June 8, 2021 15:14

alalek reviewed Jun 25, 2021

View reviewed changes

rogday force-pushed the base64_encoding branch 3 times, most recently from 9a28098 to e7cae25 Compare June 29, 2021 09:18

alalek assigned vpisarev Jun 30, 2021

rogday changed the title ~~[WIP]: port base64 encoding from 3.4~~ port base64 encoding from 3.4 Jul 7, 2021

port base64 encoding from 3.4

b42623f

rogday force-pushed the base64_encoding branch from 55cf014 to b42623f Compare July 8, 2021 07:43

asmorkalov approved these changes Jul 19, 2021

View reviewed changes

alalek assigned asmorkalov and unassigned vpisarev Jul 19, 2021

opencv-pushbot merged commit 4ab0377 into opencv:master Jul 19, 2021

rogday deleted the base64_encoding branch October 7, 2021 13:14

alalek mentioned this pull request Oct 15, 2021

(5.x) Merge 4.x #20886

Merged

Uh oh!

Conversation

rogday commented May 24, 2021 • edited by alalek Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

alalek left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

alalek commented Jul 7, 2021

Uh oh!

rogday commented Jul 8, 2021

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

rogday commented May 24, 2021 •

edited by alalek

Loading