Minor tweaks from PR review

CesiumGltf/include/CesiumGltf/FeatureIdTextureView.h

@@ -111,7 +111,7 @@ class FeatureIdTextureView : public TextureView {
   FeatureIdTextureView(
       const Model& model,
       const FeatureIdTexture& featureIdTexture,
-      TextureViewOptions options = TextureViewOptions()) noexcept;
+      const TextureViewOptions& options = TextureViewOptions()) noexcept;
 
   /**
    * @brief Get the feature ID from the texture at the given texture

CesiumGltf/include/CesiumGltf/PropertyTexturePropertyView.h

@@ -294,7 +294,7 @@ class PropertyTexturePropertyView<ElementType, false>
       const ClassProperty& classProperty,
       const Sampler& sampler,
       const ImageCesium& image,
-      TextureViewOptions options = TextureViewOptions()) noexcept
+      const TextureViewOptions& options = TextureViewOptions()) noexcept
       : PropertyView<ElementType, false>(classProperty, property),
         TextureView(
             sampler,
@@ -482,9 +482,8 @@ class PropertyTexturePropertyView<ElementType, true>
   /**
    * @brief Constructs an instance of an empty property that specifies a
    * default value. Although this property has no data, it can return the
-   * default value
-   * when {@link PropertyTexturePropertyView::get} is called. However,
-   * {@link PropertyTexturePropertyView::getRaw} cannot be used.
+   * default value when {@link PropertyTexturePropertyView::get} is called.
+   * However, {@link PropertyTexturePropertyView::getRaw} cannot be used.
    *
    * @param classProperty The {@link ClassProperty} this property conforms to.
    */
@@ -526,7 +525,7 @@ class PropertyTexturePropertyView<ElementType, true>
       const ClassProperty& classProperty,
       const Sampler& sampler,
       const ImageCesium& image,
-      TextureViewOptions options = TextureViewOptions()) noexcept
+      const TextureViewOptions& options = TextureViewOptions()) noexcept
       : PropertyView<ElementType, true>(classProperty, property),
         TextureView(
             sampler,

CesiumGltf/include/CesiumGltf/PropertyTextureView.h

@@ -3,10 +3,10 @@
 #include "CesiumGltf/Class.h"
 #include "CesiumGltf/ClassProperty.h"
 #include "CesiumGltf/ExtensionModelExtStructuralMetadata.h"
+#include "CesiumGltf/Model.h"
 #include "CesiumGltf/PropertyTexture.h"
 #include "CesiumGltf/PropertyTexturePropertyView.h"
 #include "CesiumGltf/TextureView.h"
-#include "Model.h"
 
 namespace CesiumGltf {
 /**
@@ -121,7 +121,7 @@ class PropertyTextureView {
   template <typename T, bool Normalized = false>
   PropertyTexturePropertyView<T, Normalized> getPropertyView(
       const std::string& propertyId,
-      TextureViewOptions propertyOptions = TextureViewOptions()) const {
+      const TextureViewOptions& propertyOptions = TextureViewOptions()) const {
     if (this->_status != PropertyTextureViewStatus::Valid) {
       return PropertyTexturePropertyView<T, Normalized>(
           PropertyTexturePropertyViewStatus::ErrorInvalidPropertyTexture);
@@ -163,7 +163,7 @@ class PropertyTextureView {
   void getPropertyView(
       const std::string& propertyId,
       Callback&& callback,
-      TextureViewOptions propertyOptions = TextureViewOptions()) const {
+      const TextureViewOptions& propertyOptions = TextureViewOptions()) const {
     if (this->_status != PropertyTextureViewStatus::Valid) {
       callback(
           propertyId,
@@ -290,7 +290,7 @@ class PropertyTextureView {
   template <typename Callback>
   void forEachProperty(
       Callback&& callback,
-      TextureViewOptions propertyOptions = TextureViewOptions()) const {
+      const TextureViewOptions& propertyOptions = TextureViewOptions()) const {
     for (const auto& property : this->_pClass->properties) {
       getPropertyView(
           property.first,
@@ -586,7 +586,7 @@ class PropertyTextureView {
   PropertyTexturePropertyView<T, Normalized> createScalarPropertyView(
       const ClassProperty& classProperty,
       [[maybe_unused]] const PropertyTextureProperty& propertyTextureProperty,
-      TextureViewOptions propertyOptions) const {
+      const TextureViewOptions& propertyOptions) const {
     if (classProperty.array) {
       return PropertyTexturePropertyView<T, Normalized>(
           PropertyTexturePropertyViewStatus::ErrorArrayTypeMismatch);

CesiumGltf/include/CesiumGltf/TextureView.h

@@ -33,7 +33,7 @@ struct TextureViewOptions {
    * the original TEXCOORD set index will be preserved. The extension's values
    * may still be retrieved using getTextureTransform, if desired.
    */
-  bool applyKhrTextureTransformExtension;
+  bool applyKhrTextureTransformExtension = false;
 
   /**
    * @brief Whether to copy the input image.
@@ -43,10 +43,7 @@ struct TextureViewOptions {
    * original glTF model. When this flag is true, the view will manage its own
    * copy of the pixel data to avoid such issues.
    */
-  bool makeImageCopy;
-
-  TextureViewOptions()
-      : applyKhrTextureTransformExtension(false), makeImageCopy(false) {}
+  bool makeImageCopy = false;
 };
 
 /**
@@ -111,7 +108,7 @@ class TextureView {
   TextureView(
       const Model& model,
       const TextureInfo& textureInfo,
-      TextureViewOptions options = TextureViewOptions()) noexcept;
+      const TextureViewOptions& options = TextureViewOptions()) noexcept;
 
   /**
    * @brief Constructs a view of the texture specified by the given {@link Sampler}
@@ -131,7 +128,7 @@ class TextureView {
       int64_t textureCoordinateSetIndex,
       const ExtensionKhrTextureTransform* pKhrTextureTransformExtension =
           nullptr,
-      TextureViewOptions options = TextureViewOptions()) noexcept;
+      const TextureViewOptions& options = TextureViewOptions()) noexcept;
 
   /**
    * @brief Get the status of this texture view.

CesiumGltf/src/FeatureIdTextureView.cpp

@@ -13,7 +13,7 @@ FeatureIdTextureView::FeatureIdTextureView() noexcept
 FeatureIdTextureView::FeatureIdTextureView(
     const Model& model,
     const FeatureIdTexture& featureIdTexture,
-    TextureViewOptions options) noexcept
+    const TextureViewOptions& options) noexcept
     : TextureView(model, featureIdTexture, options),
       _status(FeatureIdTextureViewStatus::ErrorUninitialized),
       _channels() {

CesiumGltf/src/TextureView.cpp

@@ -17,7 +17,7 @@ TextureView::TextureView() noexcept
 TextureView::TextureView(
     const Model& model,
     const TextureInfo& textureInfo,
-    TextureViewOptions options) noexcept
+    const TextureViewOptions& options) noexcept
     : _textureViewStatus(TextureViewStatus::ErrorUninitialized),
       _pSampler(nullptr),
       _pImage(nullptr),
@@ -69,7 +69,7 @@ TextureView::TextureView(
   }
 
   if (options.makeImageCopy) {
-    this->_imageCopy = ImageCesium(*this->_pImage);
+    this->_imageCopy = *this->_pImage;
   }
 
   this->_textureViewStatus = TextureViewStatus::Valid;
@@ -80,7 +80,7 @@ TextureView::TextureView(
     const ImageCesium& image,
     int64_t textureCoordinateSetIndex,
     const ExtensionKhrTextureTransform* pKhrTextureTransformExtension,
-    TextureViewOptions options) noexcept
+    const TextureViewOptions& options) noexcept
     : _textureViewStatus(TextureViewStatus::ErrorUninitialized),
       _pSampler(&sampler),
       _pImage(&image),
@@ -102,7 +102,7 @@ TextureView::TextureView(
   }
 
   if (options.makeImageCopy) {
-    this->_imageCopy = ImageCesium(*this->_pImage);
+    this->_imageCopy = *this->_pImage;
   }
 
   this->_textureViewStatus = TextureViewStatus::Valid;