Skip to content

Commit 7fd93e6

Browse files
authored
Fixes cases of invalid image folder path and input column name (#4691)
* Fixes cases of invalid image folder path and input column name * Update ImageLoader.cs * Update ExtensionsCatalog.cs * Update ImageLoader.cs * Update ImageLoader.cs
1 parent 74917b9 commit 7fd93e6

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

src/Microsoft.ML.ImageAnalytics/ImageLoader.cs

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -89,10 +89,8 @@ internal sealed class Options : TransformInputBase
8989
/// <param name="imageFolder">Folder where to look for images.</param>
9090
/// <param name="columns">Names of input and output columns.</param>
9191
internal ImageLoadingTransformer(IHostEnvironment env, string imageFolder = null, params (string outputColumnName, string inputColumnName)[] columns)
92-
: base(Contracts.CheckRef(env, nameof(env)).Register(nameof(ImageLoadingTransformer)), columns)
92+
: this (env, imageFolder, type: true, columns)
9393
{
94-
ImageFolder = imageFolder;
95-
_useImageType = true;
9694
}
9795

9896
/// <summary>
@@ -105,7 +103,11 @@ internal ImageLoadingTransformer(IHostEnvironment env, string imageFolder = null
105103
internal ImageLoadingTransformer(IHostEnvironment env, string imageFolder = null, bool type = true, params (string outputColumnName, string inputColumnName)[] columns)
106104
: base(Contracts.CheckRef(env, nameof(env)).Register(nameof(ImageLoadingTransformer)), columns)
107105
{
108-
ImageFolder = imageFolder;
106+
// Throws ArgumentException if given imageFolder path is invalid or empty. Note: imageFolder may be null in this case.
107+
if (imageFolder != null)
108+
ImageFolder = Path.GetFullPath(imageFolder);
109+
else
110+
ImageFolder = null;
109111
_useImageType = type;
110112
}
111113

0 commit comments

Comments
 (0)