Skip to content

Commit

Permalink
Fix bmff exception; Bump Conan version (#2375)
Browse files Browse the repository at this point in the history
- This is a partial backport of #2364. The new exceptions in `::setExifData()`/`::setIptcData()`/`::setXmpData()` are not included as they could change the control flow of the maintenance branch for the user.
- Conan change is a backport of #2361
- Closes #2350
  • Loading branch information
postscript-dev authored Oct 18, 2022
1 parent 34c8b2b commit 4f1d091
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/on_PR_linux_matrix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
- name: install dependencies
run: |
sudo apt-get install ninja-build
pip3 install conan==1.51.0
pip3 install conan==1.52.0
- name: Conan common config
run: |
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/on_PR_linux_special_buils.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
- name: install dependencies
run: |
sudo apt-get install ninja-build
pip3 install conan==1.51.0
pip3 install conan==1.52.0
- name: Conan common config
run: |
Expand Down Expand Up @@ -63,7 +63,7 @@ jobs:
run: |
sudo apt-get update
sudo apt-get install valgrind ninja-build
pip3 install conan==1.51.0
pip3 install conan==1.52.0
- name: Conan common config
run: |
Expand Down Expand Up @@ -100,7 +100,7 @@ jobs:
- name: install dependencies
run: |
sudo apt-get install ninja-build
pip3 install conan==1.51.0
pip3 install conan==1.52.0
- name: Conan common config
run: |
Expand Down Expand Up @@ -136,7 +136,7 @@ jobs:
run: |
sudo apt-get update
sudo apt-get install valgrind doxygen graphviz gettext
pip3 install conan==1.51.0
pip3 install conan==1.52.0
- name: Conan common config
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/on_PR_windows_matrix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ jobs:

- name: Install Conan & Common config
run: |
pip.exe install "conan==1.51.0"
pip.exe install "conan==1.52.0"
conan profile new --detect default
conan profile update settings.build_type=${{matrix.build_type}} default
conan profile update settings.compiler="Visual Studio" default
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/on_push_BasicWinLinMac.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:

- name: Install Conan & Common config
run: |
pip.exe install "conan==1.51.0"
pip.exe install "conan==1.52.0"
conan config install https://github.com/conan-io/conanclientcert.git
conan profile new --detect default
conan profile show default
Expand Down Expand Up @@ -77,7 +77,7 @@ jobs:
- name: install dependencies
run: |
sudo apt-get install ninja-build
pip3 install conan==1.51.0
pip3 install conan==1.52.0
- name: Conan
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/on_push_ExtraJobsForMain.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:

- name: install dependencies
run: |
pip3 install conan==1.51.0
pip3 install conan==1.52.0
- name: Conan common config
run: |
Expand Down
2 changes: 1 addition & 1 deletion src/bmffimage.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -711,7 +711,7 @@ namespace Exiv2
void BmffImage::writeMetadata()
{
// bmff files are read-only
throw(Error(kerInvalidSettingForImage, "Image comment", "BMFF"));
throw(Error(kerWritingImageFormatUnsupported, "BMFF"));
} // BmffImage::writeMetadata

// *************************************************************************
Expand Down

0 comments on commit 4f1d091

Please sign in to comment.