Skip to content

bug fix to Inconsistent comment for EXIF issue id #15706#16535

Merged
opencv-pushbot merged 1 commit intoopencv:3.4from
jshiwam:exifbugfix
Feb 28, 2020
Merged

bug fix to Inconsistent comment for EXIF issue id #15706#16535
opencv-pushbot merged 1 commit intoopencv:3.4from
jshiwam:exifbugfix

Conversation

@jshiwam
Copy link
Copy Markdown
Contributor

@jshiwam jshiwam commented Feb 8, 2020

resolves #15706

Pull Request Readiness Checklist

See details at https://github.com/opencv/opencv/wiki/How_to_contribute#making-a-good-pull-request

  • I agree to contribute to the project under OpenCV (BSD) License.
  • To the best of my knowledge, the proposed patch is not based on a code under GPL or other license that is incompatible with OpenCV
  • The PR is proposed to proper branch
  • There is reference to original bug report and related work
  • There is accuracy test, performance test and test data in opencv_extra repository, if applicable
    Patch to opencv_extra has the same branch name.
  • The feature is well documented and sample code can be built with the project CMake

@alalek
Copy link
Copy Markdown
Member

alalek commented Feb 20, 2020

This patch should go into 3.4 branch first. We will merge changes from 3.4 into master regularly (weekly/bi-weekly).

So, please:

  • change "base" branch of this PR: master => 3.4 (use "Edit" button near PR title)
  • rebase your commits from master onto 3.4 branch. For example:
    git rebase -i --onto upstream/3.4 upstream/master
    (check list of your commits, save and quit (Esc + "wq" + Enter)
    where upstream is configured by following [this GitHub guide]
    (https://help.github.com/articles/configuring-a-remote-for-a-fork/) and fetched (git fetch upstream).
    In this case (due merge commit) you should squash commits into one before rebase.
  • push rebased commits into source branch of your fork (with --force option)

Note: no needs to re-open PR, apply changes "inplace".

@jshiwam jshiwam changed the base branch from master to 3.4 February 21, 2020 11:38
@alalek
Copy link
Copy Markdown
Member

alalek commented Feb 22, 2020

You should check commit message and its content.
You may use "gitk" (builtin git tool) locally for that.

@jshiwam
Copy link
Copy Markdown
Contributor Author

jshiwam commented Feb 24, 2020

The error produced by build bot is:

/persistence_yml.cpp:36:31: error: 'd' was not declared in this scope
while( cv_isprint(d) && d != ' ' && d != '>' );
^
/build/precommit_linux64/3.4/opencv/modules/core/src/persistence.hpp:216:36: note: in definition of macro 'cv_isprint'
#define cv_isprint(c) ((uchar)(c) >= (uchar)' ')
^
/build/precommit_linux64/3.4/opencv/modules/core/src/persistence_yml.cpp:42:21: error: 'value_type' was not declared in this scope
value_type |= CV_NODE_USER;
^
/build/precommit_linux64/3.4/opencv/modules/core/src/persistence_yml.cpp: At global scope:

I checked the file persistence_yml.cpp but where I found that 'd' was declared as
do d = *++typeEndPtr;

whereas value_type is not declared.
I didn't even make changes in these files how/why do these files generate error, is it because I rebased my branch where I merged changes from others as well to resolve the conflicts.

@alalek
Copy link
Copy Markdown
Member

alalek commented Feb 24, 2020

I didn't even make changes in these files

You should check contents of this patch:

  • Files changed 10

You bring unnecessary/wrong code changes from other branch.

@jshiwam
Copy link
Copy Markdown
Contributor Author

jshiwam commented Feb 25, 2020

I didn't even make changes in these files

You should check contents of this patch:

* Files changed 10

You bring unnecessary/wrong code changes from other branch.

I Will fix that

@alalek
Copy link
Copy Markdown
Member

alalek commented Feb 25, 2020

Commits 4
Files changed 4

Please remove unnecessary changes from the patch. We should have 1 commit and 1 changed file here.
Commits squashing and/or commit amending may help to do that.

@jshiwam jshiwam force-pushed the exifbugfix branch 2 times, most recently from ab8d5da to 4b78550 Compare February 28, 2020 05:52
… added final

removed all the changes occured while trying to resolve conflicts
@jshiwam
Copy link
Copy Markdown
Contributor Author

jshiwam commented Feb 28, 2020

Commits 4
Files changed 4

Please remove unnecessary changes from the patch. We should have 1 commit and 1 changed file here.
Commits squashing and/or commit amending may help to do that.

Done

@opencv-pushbot opencv-pushbot merged commit 7ffab23 into opencv:3.4 Feb 28, 2020
@alalek alalek mentioned this pull request Feb 28, 2020
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.

Inconsistent comment for EXIF

4 participants