Merge branch 4.x

modules/imgcodecs/src/apple_conversions.h

@@ -2,10 +2,27 @@
 // It is subject to the license terms in the LICENSE file found in the top-level directory
 // of this distribution and at http://opencv.org/license.html.
 
+#ifndef OPENCV_IMGCODECS_APPLE_CONVERSIONS_H
+#define OPENCV_IMGCODECS_APPLE_CONVERSIONS_H
+
 #include "opencv2/core.hpp"
 #import <Accelerate/Accelerate.h>
+
+#include <TargetConditionals.h>
+
+#ifdef HAVE_AVFOUNDATION
 #import <AVFoundation/AVFoundation.h>
+#endif
+
+#if TARGET_OS_IPHONE || (defined(MAC_OS_X_VERSION_MAX_ALLOWED) && MAC_OS_X_VERSION_MAX_ALLOWED >= 1080)
 #import <ImageIO/ImageIO.h>
+#else
+#import <ApplicationServices/ApplicationServices.h>
+#import <CoreFoundation/CoreFoundation.h>
+#import <Foundation/Foundation.h>
+#endif
 
 CV_EXPORTS CGImageRef MatToCGImage(const cv::Mat& image) CF_RETURNS_RETAINED;
 CV_EXPORTS void CGImageToMat(const CGImageRef image, cv::Mat& m, bool alphaExist);
+
+#endif // OPENCV_IMGCODECS_APPLE_CONVERSIONS_H

modules/imgcodecs/src/apple_conversions.mm

@@ -5,6 +5,12 @@
 #include "apple_conversions.h"
 #include "precomp.hpp"
 
+#import <Foundation/Foundation.h>
+
+#ifndef __bridge
+#define __bridge
+#endif
+
 CGImageRef MatToCGImage(const cv::Mat& image) {
     NSData *data = [NSData dataWithBytes:image.data
                                   length:image.step.p[0] * image.rows];

modules/imgcodecs/src/grfmt_sunras.cpp

@@ -61,10 +61,22 @@ bool  SunRasterDecoder::readHeader()
         int palSize = (m_bpp > 0 && m_bpp <= 8) ? (3*(1 << m_bpp)) : 0;
 
         m_strm.skip( 4 );
-        m_encoding = (SunRasType)m_strm.getDWord();
-        m_maptype = (SunRasMapType)m_strm.getDWord();
+        // Read as plain integers first; validate before casting to enum types.
+        // Casting an out-of-range integer directly to an enum with no fixed
+        // underlying type is undefined behavior (C++11 §7.2/8). Reject invalid
+        // values early so no downstream code ever touches an ill-formed enum.
+        const int raw_encoding = (int)m_strm.getDWord();
+        const int raw_maptype  = (int)m_strm.getDWord();
         m_maplength = m_strm.getDWord();
 
+        if (raw_encoding < RAS_OLD || raw_encoding > RAS_FORMAT_RGB)
+            return false;
+        if (raw_maptype < RMT_NONE || raw_maptype > RMT_EQUAL_RGB)
+            return false;
+
+        m_encoding = (SunRasType)raw_encoding;
+        m_maptype  = (SunRasMapType)raw_maptype;
+
         if( m_width > 0 && m_height > 0 &&
             (m_bpp == 1 || m_bpp == 8 || m_bpp == 24 || m_bpp == 32) &&
             (m_encoding == RAS_OLD || m_encoding == RAS_STANDARD ||

modules/imgcodecs/src/macosx_conversions.mm

@@ -13,9 +13,11 @@ NSImage* MatToNSImage(const cv::Mat& image) {
     CGImageRef imageRef = MatToCGImage(image);
 
     // Getting NSImage from CGImage
-    NSImage *nsImage = [[NSImage alloc] initWithCGImage:imageRef size:CGSizeMake(CGImageGetWidth(imageRef), CGImageGetHeight(imageRef))];
+    NSSize imageSize = NSMakeSize(CGImageGetWidth(imageRef), CGImageGetHeight(imageRef));
+    NSImage *nsImage = [[NSImage alloc] initWithCGImage:imageRef size:imageSize];
     CGImageRelease(imageRef);
 
+
     return nsImage;
 }