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

Jbl/cleanup jxrlib #67

Merged
merged 101 commits into from
Oct 16, 2023
Merged

Jbl/cleanup jxrlib #67

merged 101 commits into from
Oct 16, 2023

Conversation

ptahmose
Copy link
Contributor

@ptahmose ptahmose commented Sep 23, 2023

Description

  • This is an attempt at refactoring, cleaning up and reworking of the jxrlib (and its integration into libCZI).
  • As a bonus, the encoding functionality of jxrlib is made accessible.
  • One benefit of the cleaning up is that it compiles now without further ado with the MinGW-environment (and therefore in CLion).
  • Removed dependency on ATL (on Windows) - also to enable building with MinGW.
  • Removed precompiled-header-files (stdafx.h/pch.h) - because build-system never made use of precompiled headers.
  • Removed "priv_guiddef.h" - definition of "GUID" does not pollute global namespace anymore.
  • Refactored gtest-integration with CMake.

Fixes # (issue)

Type of change

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • This change requires a documentation update

How Has This Been Tested?

Describe the tests that you ran to verify your changes.
Provide instructions to reproduce.

Checklist:

  • I followed the Contributing Guidelines.
  • I did a self-review.
  • I commented my code, particularly in hard-to-understand areas.
  • I updated the documentation.
  • I updated the version of libCZI following Versioning of libCZI depending on the type of change
    • Bug fix -> PATCH
    • New feature -> MINOR
    • Breaking change -> MAJOR
  • I have added tests that prove my fix is effective or that my feature works.
  • New and existing unit tests pass locally with my changes.

@codecov
Copy link

codecov bot commented Sep 23, 2023

Codecov Report

Merging #67 (efd7f35) into main (f18a030) will increase coverage by 0.65%.
The diff coverage is n/a.

@@            Coverage Diff             @@
##             main      #67      +/-   ##
==========================================
+ Coverage   63.25%   63.90%   +0.65%     
==========================================
  Files          76       75       -1     
  Lines       10098    10117      +19     
==========================================
+ Hits         6387     6465      +78     
+ Misses       3711     3652      -59     
Flag Coverage Δ
windows-latest 63.90% <ø> (+0.65%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Files Coverage Δ
Src/libCZI/BitmapOperations.cpp 47.05% <ø> (+3.78%) ⬆️
Src/libCZI/BitmapOperations.hpp 30.98% <ø> (ø)
Src/libCZI/CZIReader.cpp 65.21% <ø> (ø)
Src/libCZI/CreateBitmap.cpp 54.28% <ø> (ø)
Src/libCZI/CziAttachment.cpp 100.00% <ø> (ø)
Src/libCZI/CziAttachmentsDirectory.cpp 73.50% <ø> (-0.23%) ⬇️
Src/libCZI/CziAttachmentsDirectory.h 100.00% <ø> (ø)
Src/libCZI/CziDimensionInfo.cpp 58.74% <ø> (ø)
Src/libCZI/CziDisplaySettings.cpp 73.83% <ø> (ø)
Src/libCZI/CziMetadata.cpp 75.37% <ø> (ø)
... and 41 more

... and 1 file with indirect coverage changes

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

@ptahmose ptahmose added the cla Contributor License Agreement sent to Admin label Sep 24, 2023
@ptahmose ptahmose marked this pull request as ready for review September 24, 2023 11:50
Copy link
Collaborator

@FelixS90 FelixS90 left a comment

Choose a reason for hiding this comment

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

Admittedly doing more of a blind approve here - due to the size of the PR. Feel free to complete if you are confident ;)

@ptahmose ptahmose merged commit 470bae2 into ZEISS:main Oct 16, 2023
15 checks passed
@ptahmose ptahmose deleted the jbl/cleanup_jxrlib branch November 3, 2023 22:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cla Contributor License Agreement sent to Admin
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants