Skip to content

Commit 672e129

Browse files
shimatclaude
andcommitted
Fix MergeDebevec/MergeMertens segfault: align C++ with ExceptionStatus pattern
Same calling-convention mismatch as #1876: photo_Ptr_MergeDebevec_get/delete and photo_Ptr_MergeMertens_get/delete were left in the old direct-return style when #1846 updated the C# P/Invoke declarations to ExceptionStatus + out-param. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
1 parent d721631 commit 672e129

1 file changed

Lines changed: 14 additions & 6 deletions

File tree

src/OpenCvSharpExtern/photo_HDR.h

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -152,26 +152,34 @@ CVAPI(cv::Ptr<cv::MergeDebevec>*) photo_createMergeDebevec()
152152
{
153153
return clone(cv::createMergeDebevec());
154154
}
155-
CVAPI(void) photo_Ptr_MergeDebevec_delete(cv::Ptr<cv::MergeDebevec>* obj)
155+
CVAPI(ExceptionStatus) photo_Ptr_MergeDebevec_delete(cv::Ptr<cv::MergeDebevec>* obj)
156156
{
157+
BEGIN_WRAP
157158
delete obj;
159+
END_WRAP
158160
}
159-
CVAPI(cv::MergeDebevec*) photo_Ptr_MergeDebevec_get(cv::Ptr<cv::MergeDebevec>* obj)
161+
CVAPI(ExceptionStatus) photo_Ptr_MergeDebevec_get(cv::Ptr<cv::MergeDebevec>* obj, cv::MergeDebevec **returnValue)
160162
{
161-
return obj->get();
163+
BEGIN_WRAP
164+
*returnValue = obj->get();
165+
END_WRAP
162166
}
163167

164168
CVAPI(cv::Ptr<cv::MergeMertens>*) photo_createMergeMertens()
165169
{
166170
return clone(cv::createMergeMertens());
167171
}
168-
CVAPI(void) photo_Ptr_MergeMertens_delete(cv::Ptr<cv::MergeMertens>* obj)
172+
CVAPI(ExceptionStatus) photo_Ptr_MergeMertens_delete(cv::Ptr<cv::MergeMertens>* obj)
169173
{
174+
BEGIN_WRAP
170175
delete obj;
176+
END_WRAP
171177
}
172-
CVAPI(cv::MergeMertens*) photo_Ptr_MergeMertens_get(cv::Ptr<cv::MergeMertens>* obj)
178+
CVAPI(ExceptionStatus) photo_Ptr_MergeMertens_get(cv::Ptr<cv::MergeMertens>* obj, cv::MergeMertens **returnValue)
173179
{
174-
return obj->get();
180+
BEGIN_WRAP
181+
*returnValue = obj->get();
182+
END_WRAP
175183
}
176184

177185
CVAPI(void) photo_MergeExposures_process(

0 commit comments

Comments
 (0)