diff --git a/.github/workflows/build-installer.yml b/.github/workflows/build-installer.yml index 3bdb004ba..526326ba9 100755 --- a/.github/workflows/build-installer.yml +++ b/.github/workflows/build-installer.yml @@ -224,7 +224,7 @@ jobs: # submit app for notarization - if xcrun notarytool submit --keychain "$HOME/Library/Keychains/signing_temp.keychain-db" -u "${{ secrets.MACOS_NOTARIZATION_USER }}" -p "${{ secrets.MACOS_NOTARIZATION_PWD }}" -i "org.test.${{env.NAME}}" "$BUNDLE_PKG" > "$NOTARIZE_APP_LOG" 2>&1; then + if xcrun notarytool submit --keychain "$HOME/Library/Keychains/signing_temp.keychain-db" -u "${{ secrets.MACOS_NOTARIZATION_USER }}" -p "${{ secrets.MACOS_NOTARIZATION_PWD }}" "$BUNDLE_PKG" > "$NOTARIZE_APP_LOG" 2>&1; then cat "$NOTARIZE_APP_LOG" RequestUUID=$(awk -F ' = ' '/RequestUUID/ {print $2}' "$NOTARIZE_APP_LOG") diff --git a/weasis-acquire/weasis-acquire-explorer/src/main/java/org/weasis/acquire/explorer/AcquireImageInfo.java b/weasis-acquire/weasis-acquire-explorer/src/main/java/org/weasis/acquire/explorer/AcquireImageInfo.java index 41b8863b8..d1d6fbeef 100755 --- a/weasis-acquire/weasis-acquire-explorer/src/main/java/org/weasis/acquire/explorer/AcquireImageInfo.java +++ b/weasis-acquire/weasis-acquire-explorer/src/main/java/org/weasis/acquire/explorer/AcquireImageInfo.java @@ -146,6 +146,9 @@ public void applyNRotation(ViewCanvas view) { } public void reloadFinalProcessing(ViewCanvas view) { + if(view == null || view.getSourceImage() == null) { + return; + } postProcessOpManager.setParamValue(CropOp.OP_NAME, CropOp.P_AREA, null); applyNRotation(view); diff --git a/weasis-parent/pom.xml b/weasis-parent/pom.xml index 06453235f..2e6aa3427 100755 --- a/weasis-parent/pom.xml +++ b/weasis-parent/pom.xml @@ -15,7 +15,7 @@ 4.4.0 - -SNAPSHOT + 21 21 @@ -27,7 +27,7 @@ ${revision}${changelist} 4.4.0 4.0.0-SNAPSHOT - https://github.com/nroduit/Weasis/blob/master/CHANGELOG.md#v440-2024-05-04 + https://github.com/nroduit/Weasis/blob/master/CHANGELOG.md#v440-2024-05-05 7.0.5 3.4.1 @@ -48,7 +48,7 @@ 2.2.6 2.0.12 - 1.5.2 + 1.5.6 1.1.7 5.32.0 4.9.0.1