diff --git a/TIASshot/Cameras/CameraBase.cs b/TIASshot/Cameras/CameraBase.cs index 1b1d3d2..8e0eaac 100644 --- a/TIASshot/Cameras/CameraBase.cs +++ b/TIASshot/Cameras/CameraBase.cs @@ -141,7 +141,7 @@ var filename = Config.GetString("File/RgbImage"); filename = filename.Replace("{NO}", $"{idx + 1:0000}"); - Cv2.ImWrite(IoUtil.CombineSaveFilePath(_saveFolder, filename), img); + IoUtil.SaveImage(IoUtil.CombineSaveFilePath(_saveFolder, filename), img); foreach (var channel in _colorCorrector.Channels) { // ConvertImage は src を in-place で CV_64FC3 に変換するため、 @@ -152,7 +152,7 @@ using (var converted = _colorCorrector.ConvertImage(imgClone, channel)) { filename = GetFilenameWithChannel("File/SrgbImage", channel); filename = filename.Replace("{NO}", $"{idx + 1:0000}"); - Cv2.ImWrite(IoUtil.CombineSaveFilePath(_saveFolder, filename), converted); + IoUtil.SaveImage(IoUtil.CombineSaveFilePath(_saveFolder, filename), converted); } } } @@ -288,8 +288,8 @@ // データ保存 SetSaveFolder("校正"); SetInfo("校正データ", _saveFolder); - Cv2.ImWrite(IoUtil.CombineSaveFilePath(_saveFolder, Config.GetString("File/TccImage")), img); - Cv2.ImWrite(IoUtil.CombineSaveFilePath(_saveFolder, Config.GetString("File/TccRoisImage")), imgRois); + IoUtil.SaveImage(IoUtil.CombineSaveFilePath(_saveFolder, Config.GetString("File/TccImage")), img); + IoUtil.SaveImage(IoUtil.CombineSaveFilePath(_saveFolder, Config.GetString("File/TccRoisImage")), imgRois); // 変換行列の計算・保存は ColorCorrector に委譲する(tccRgb の所有権は渡さない) _colorCorrector.CalcTcc(tccRgb, _saveFolder, IoUtil.SaveMatToCsv);