Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix 1004 Canon Lens Fixes (0.27->master) #1157

Merged
merged 1 commit into from
Apr 14, 2020
Merged

Conversation

clanmills
Copy link
Collaborator

@clanmills clanmills commented Apr 13, 2020

#1004 These are changes concerning Canon Lenses. They were incorrectly included in #1136.

@sridharb1 Please inspect and test on Windows. And I totally baffled by the confusion of the name of path-test being occassionally changed to pathtest. That cannot be correct. I think its a issue in contrib/vs2019/solution/samples/pathtest.vcxproj

I see there's trouble in samples/CMakeLists.txt with this. I'll investigate and fix that on 0.27-maintenance tomorrow. Sssshhh. I don't know we haven't spotted this years ago! Logged #1158

723 rmills@rmillsmbp:~/gnu/github/exiv2/0.27-maintenance/samples $ grep pathtest CMakeLists.txt 
add_executable(          pathtest  path-test.cpp ../src/utils.cpp ../src/getopt.cpp)
list(APPEND APPLICATIONS pathtest)
set_target_properties(   pathtest  PROPERTIES OUTPUT_NAME path-test )
target_include_directories(pathtest PRIVATE ${CMAKE_SOURCE_DIR}/src) # To find utils.hpp
install( TARGETS metacopy pathtest exiv2json RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})

@codecov
Copy link

codecov bot commented Apr 13, 2020

Codecov Report

Merging #1157 into 0.27-maintenance will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@                Coverage Diff                @@
##           0.27-maintenance    #1157   +/-   ##
=================================================
  Coverage             62.57%   62.57%           
=================================================
  Files                   158      158           
  Lines                 22826    22826           
=================================================
  Hits                  14283    14283           
  Misses                 8543     8543           
Impacted Files Coverage Δ
src/canonmn_int.cpp 88.08% <ø> (ø)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update b2357c5...3226573. Read the comment docs.

Copy link
Collaborator

@sridharb1 sridharb1 left a comment

Choose a reason for hiding this comment

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

Looks good. Thanks.

@clanmills clanmills merged commit a4c21f9 into 0.27-maintenance Apr 14, 2020
@clanmills clanmills deleted the fix_1004_0.27 branch April 14, 2020 06:40
@clanmills clanmills changed the title fix_1004_0.27 fix_1004_0.27_canon_lenses Apr 16, 2020
@clanmills clanmills changed the title fix_1004_0.27_canon_lenses fix 1004 Canon Lens Fixes 0.27->master Apr 17, 2020
@clanmills clanmills changed the title fix 1004 Canon Lens Fixes 0.27->master fix 1004 Canon Lens Fixes (0.27->master) Apr 17, 2020
@clanmills clanmills mentioned this pull request Apr 27, 2020
@clanmills clanmills mentioned this pull request Jan 19, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants