@shopify/react-native-skia 0.1.213 → 0.1.214

package/react-native-skia.podspec

@@ -17,7 +17,7 @@ Pod::Spec.new do |s|
   # optional - use expanded license entry instead:
   # s.license    = { :type => "MIT", :file => "LICENSE" }
   s.authors      = { "Your Name" => "yourname@email.com" }
-  s.platforms    = { :ios => "9.0" }
+  s.platforms    = { :ios => "12.0" }
   s.source       = { :git => "https://github.com/shopify/react-native-skia/react-native-skia.git", :tag => "#{s.version}" }
 
   s.requires_arc = true

package/src/dom/nodes/datatypes/Rect.ts

@@ -4,8 +4,12 @@ import type { RectCtor, RectDef, RRectCtor, RRectDef } from "../../types";
 
 import { processRadius } from "./Radius";
 
-export const isEdge = (pos: Vector, b: SkRect) =>
-  pos.x === b.x || pos.y === b.y || pos.x === b.width || pos.y === b.height;
+export const isEdge = (pos: Vector, b: SkRect) => {
+  "worklet";
+  return (
+    pos.x === b.x || pos.y === b.y || pos.x === b.width || pos.y === b.height
+  );
+};
 
 // We have an issue to check property existence on JSI backed instances
 const isRRectCtor = (def: RRectDef): def is RRectCtor =>

package/src/external/reanimated/index.ts

@@ -1,2 +1,3 @@
 export * from "./useSharedValueEffect";
+export * from "./useDerivedValueOnJS";
 export * from "./renderHelpers";

package/src/external/reanimated/moduleWrapper.ts

@@ -36,14 +36,6 @@ export function throwOnMissingReanimated() {
   }
 }
 
-function throwOnMissingReanimated3() {
-  if (!HAS_REANIMATED3) {
-    throw new Error(
-      `Reanimated version ${reanimatedVersion} is not supported, please upgrade to 3.0.0 or newer.`
-    );
-  }
-}
-
 export const useSharedValue =
   Reanimated2?.useSharedValue ||
   ((value: number) => useMemo(() => ({ value }), [value]));
@@ -56,6 +48,10 @@ export const runOnJS = Reanimated2?.runOnJS || throwOnMissingReanimated;
 export const isSharedValue = <T>(
   value: unknown
 ): value is SharedValueType<T> => {
-  throwOnMissingReanimated3();
-  return !!value && Reanimated3.isSharedValue(value);
+  return (
+    !!value &&
+    (Reanimated3
+      ? Reanimated3.isSharedValue(value)
+      : (value as any).value !== undefined)
+  );
 };

package/src/external/reanimated/renderHelpers.ts

@@ -9,12 +9,14 @@ import {
   stopMapper,
   isSharedValue,
   HAS_REANIMATED3,
+  HAS_REANIMATED2,
+  runOnJS,
 } from "./moduleWrapper";
 
 const _bindings = new WeakMap<Node<unknown>, unknown>();
 
 export function extractReanimatedProps(props: AnimatedProps<any>) {
-  if (!HAS_REANIMATED3) {
+  if (!HAS_REANIMATED3 && !HAS_REANIMATED2) {
     return [props, {}];
   }
   const reanimatedProps = {} as AnimatedProps<any>;
@@ -34,11 +36,49 @@ export function extractReanimatedProps(props: AnimatedProps<any>) {
   return [otherProps, reanimatedProps];
 }
 
+function bindReanimatedProps2(
+  container: Container,
+  node: Node<any>,
+  reanimatedProps: AnimatedProps<any>
+) {
+  const sharedValues = Object.values(reanimatedProps);
+  const previousMapperId = _bindings.get(node);
+  if (previousMapperId !== undefined) {
+    stopMapper(previousMapperId);
+  }
+  if (sharedValues.length > 0) {
+    const viewId = container.getNativeId();
+    const { SkiaViewApi } = global;
+    const updateProps = () => {
+      for (const propName in reanimatedProps) {
+        node && node.setProp(propName, reanimatedProps[propName].value);
+      }
+      // On React Native we use the SkiaViewApi to redraw because it can
+      // run on the worklet thread (container.redraw can't)
+      // if SkiaViewApi is undefined, we are on web and container.redraw()
+      // can safely be invoked
+      if (SkiaViewApi) {
+        SkiaViewApi.requestRedraw(viewId);
+      } else {
+        container.redraw();
+      }
+    };
+    const mapperId = startMapper(() => {
+      "worklet";
+      runOnJS(updateProps)();
+    }, sharedValues);
+    _bindings.set(node, mapperId);
+  }
+}
+
 export function bindReanimatedProps(
   container: Container,
   node: Node<any>,
   reanimatedProps: AnimatedProps<any>
 ) {
+  if (HAS_REANIMATED2) {
+    return bindReanimatedProps2(container, node, reanimatedProps);
+  }
   if (!HAS_REANIMATED3) {
     return;
   }

package/src/external/reanimated/useDerivedValueOnJS.ts

@@ -0,0 +1,24 @@
+import { useEffect, type DependencyList } from "react";
+
+import {
+  useSharedValue,
+  runOnJS,
+  startMapper,
+  stopMapper,
+} from "./moduleWrapper";
+
+export const useDerivedValueOnJS = (
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  fn: () => any,
+  deps?: DependencyList
+) => {
+  const value = useSharedValue(fn());
+  useEffect(() => {
+    const mapperId = startMapper(() => {
+      "worklet";
+      runOnJS(fn)();
+    }, deps);
+    return () => stopMapper(mapperId);
+  }, [deps, fn]);
+  return value;
+};

package/src/external/reanimated/useSharedValueEffect.ts

@@ -8,7 +8,6 @@ import {
   runOnJS,
   startMapper,
   stopMapper,
-  HAS_REANIMATED3,
 } from "./moduleWrapper";
 
 /**
@@ -22,12 +21,10 @@ export const useSharedValueEffect = <T = number>(
   value: SharedValueType<T>,
   ...values: SharedValueType<T>[]
 ) => {
-  if (HAS_REANIMATED3) {
-    console.warn(
-      `useSharedValueEffect() is deprecated with Reanimated 3, you can use Reanimated values directly.
-Learn more at https://shopify.github.io/react-native-skia/docs/animations/reanimated.`
-    );
-  }
+  console.warn(
+    `useSharedValueEffect() is deprecated and will be removed in the next release
+Learn more at https://shopify.github.io/react-native-skia/docs/animations/animations.`
+  );
   const input = useSharedValue(0);
 
   useEffect(() => {

package/cpp/skia/include/core/SkDeferredDisplayList.h

@@ -1,15 +0,0 @@
-/*
- * Copyright 2017 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-// TODO(kjlubick, robertphillips) migrate Chromium to use the new location and name
-#include "include/private/chromium/GrDeferredDisplayList.h" // IWYU pragma: export
-
-class GrDeferredDisplayListRecorder;
-class GrSurfaceCharacterization;
-using SkDeferredDisplayList = GrDeferredDisplayList;
-using SkDeferredDisplayListRecorder = GrDeferredDisplayListRecorder;
-using SkSurfaceCharacterization = GrSurfaceCharacterization;

package/cpp/skia/include/core/SkDeferredDisplayListRecorder.h

@@ -1,15 +0,0 @@
-/*
- * Copyright 2017 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-// TODO(kjlubick, robertphillips) migrate Chromium to use the new location
-#include "include/private/chromium/GrDeferredDisplayListRecorder.h" // IWYU pragma: export
-
-class GrDeferredDisplayList;
-class GrSurfaceCharacterization;
-using SkDeferredDisplayList = GrDeferredDisplayList;
-using SkDeferredDisplayListRecorder = GrDeferredDisplayListRecorder;
-using SkSurfaceCharacterization = GrSurfaceCharacterization;

package/cpp/skia/include/core/SkPromiseImageTexture.h

@@ -1,20 +0,0 @@
-/*
- * Copyright 2017 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef SkPromiseImageTexture_DEFINED
-#define SkPromiseImageTexture_DEFINED
-
-#include "include/core/SkTypes.h"
-
-// TODO(kjlubick) remove this shim header after clients are migrated
-#if defined(SK_GANESH)
-#include "include/private/chromium/GrPromiseImageTexture.h"
-
-typedef GrPromiseImageTexture SkPromiseImageTexture;
-#endif
-
-#endif // SkPromiseImageTexture_DEFINED

package/cpp/skia/include/core/SkSurfaceCharacterization.h

@@ -1,15 +0,0 @@
-/*
- * Copyright 2017 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-// TODO(kjlubick, robertphillips) migrate Chromium to use the new location and name
-#include "include/private/chromium/GrSurfaceCharacterization.h" // IWYU pragma: export
-
-class GrDeferredDisplayList;
-class GrDeferredDisplayListRecorder;
-using SkDeferredDisplayList = GrDeferredDisplayList;
-using SkDeferredDisplayListRecorder = GrDeferredDisplayListRecorder;
-using SkSurfaceCharacterization = GrSurfaceCharacterization;

package/cpp/skia/include/core/SkTime.h

@@ -1,63 +0,0 @@
-
-/*
- * Copyright 2006 The Android Open Source Project
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-
-#ifndef SkTime_DEFINED
-#define SkTime_DEFINED
-
-#include "include/core/SkTypes.h"
-#include "include/private/base/SkMacros.h"
-
-#include <cinttypes>
-
-class SkString;
-
-/** \class SkTime
-    Platform-implemented utilities to return time of day, and millisecond counter.
-*/
-class SK_API SkTime {
-public:
-    struct DateTime {
-        int16_t  fTimeZoneMinutes;  // The number of minutes that GetDateTime()
-                                    // is ahead of or behind UTC.
-        uint16_t fYear;          //!< e.g. 2005
-        uint8_t  fMonth;         //!< 1..12
-        uint8_t  fDayOfWeek;     //!< 0..6, 0==Sunday
-        uint8_t  fDay;           //!< 1..31
-        uint8_t  fHour;          //!< 0..23
-        uint8_t  fMinute;        //!< 0..59
-        uint8_t  fSecond;        //!< 0..59
-
-        void toISO8601(SkString* dst) const;
-    };
-    static void GetDateTime(DateTime*);
-
-    static double GetSecs() { return GetNSecs() * 1e-9; }
-    static double GetMSecs() { return GetNSecs() * 1e-6; }
-    static double GetNSecs();
-};
-
-///////////////////////////////////////////////////////////////////////////////
-
-class SkAutoTime {
-public:
-    // The label is not deep-copied, so its address must remain valid for the
-    // lifetime of this object
-    SkAutoTime(const char* label = nullptr)
-        : fLabel(label)
-        , fNow(SkTime::GetMSecs()) {}
-    ~SkAutoTime() {
-        uint64_t dur = static_cast<uint64_t>(SkTime::GetMSecs() - fNow);
-        SkDebugf("%s %" PRIu64 "\n", fLabel ? fLabel : "", dur);
-    }
-private:
-    const char* fLabel;
-    double      fNow;
-};
-
-#endif

package/cpp/skia/include/effects/SkOpPathEffect.h

@@ -1,43 +0,0 @@
-/*
- * Copyright 2018 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef SkOpPathEffect_DEFINED
-#define SkOpPathEffect_DEFINED
-
-#include "include/core/SkPaint.h"
-#include "include/core/SkRefCnt.h"
-#include "include/core/SkScalar.h"
-#include "include/core/SkTypes.h"
-#include "include/pathops/SkPathOps.h"
-
-class SkMatrix;
-class SkPathEffect;
-
-class SK_API SkMergePathEffect {
-public:
-    /*  Defers to two other patheffects, and then combines their outputs using the specified op.
-     *  e.g.
-     *      result = output_one op output_two
-     *
-     *  If either one or two is nullptr, then the original path is passed through to the op.
-     */
-    static sk_sp<SkPathEffect> Make(sk_sp<SkPathEffect> one, sk_sp<SkPathEffect> two, SkPathOp op);
-};
-
-class SK_API SkMatrixPathEffect {
-public:
-    static sk_sp<SkPathEffect> MakeTranslate(SkScalar dx, SkScalar dy);
-    static sk_sp<SkPathEffect> Make(const SkMatrix&);
-};
-
-class SK_API SkStrokePathEffect {
-public:
-    static sk_sp<SkPathEffect> Make(SkScalar width, SkPaint::Join, SkPaint::Cap,
-                                    SkScalar miter = 4);
-};
-
-#endif

package/cpp/skia/include/effects/SkStrokeAndFillPathEffect.h

@@ -1,28 +0,0 @@
-/*
- * Copyright 2020 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef SkStrokeAndFillPathEffect_DEFINED
-#define SkStrokeAndFillPathEffect_DEFINED
-
-#include "include/core/SkPaint.h"
-#include "include/core/SkPathEffect.h"
-#include "include/pathops/SkPathOps.h"
-
-class SK_API SkStrokeAndFillPathEffect {
-public:
-    /*  If the paint is set to stroke, this will add the stroke and fill geometries
-     *  together (hoping that the winding-direction works out).
-     *
-     *  If the paint is set to fill, this effect is ignored.
-     *
-     *  Note that if the paint is set to stroke and the stroke-width is 0, then
-     *  this will turn the geometry into just a fill.
-     */
-    static sk_sp<SkPathEffect> Make();
-};
-
-#endif

package/cpp/skia/include/gpu/GrBackendSurfaceMutableState.h

@@ -1,32 +0,0 @@
-/*
- * Copyright 2020 Google LLC
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef GrBackendSurfaceMutableState_DEFINED
-#define GrBackendSurfaceMutableState_DEFINED
-
-#include "include/gpu/MutableTextureState.h"
-
-#ifdef SK_VULKAN
-#include "include/private/gpu/vk/SkiaVulkan.h"
-
-#include <cstdint>
-#endif
-
-class GrBackendSurfaceMutableState : public skgpu::MutableTextureState {
-public:
-    GrBackendSurfaceMutableState() = default;
-
-#ifdef SK_VULKAN
-    GrBackendSurfaceMutableState(VkImageLayout layout, uint32_t queueFamilyIndex)
-            : skgpu::MutableTextureState(layout, queueFamilyIndex) {}
-#endif
-
-    GrBackendSurfaceMutableState(const GrBackendSurfaceMutableState& that)
-            : skgpu::MutableTextureState(that) {}
-};
-
-#endif

package/cpp/skia/include/gpu/dawn/GrDawnTypes.h

@@ -1,95 +0,0 @@
-/*
- * Copyright 2019 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef GrDawnTypes_DEFINED
-#define GrDawnTypes_DEFINED
-
-#include "include/gpu/GpuTypes.h"
-
-#ifdef Always
-#undef Always
-static constexpr int Always = 2;
-#endif
-#ifdef Success
-#undef Success
-static constexpr int Success = 0;
-#endif
-#ifdef None
-#undef None
-static constexpr int None = 0L;
-#endif
-#include "webgpu/webgpu_cpp.h" // IWYU pragma: export
-
-struct GrDawnTextureInfo {
-    wgpu::Texture       fTexture;
-    wgpu::TextureFormat fFormat;
-    uint32_t            fLevelCount;
-    GrDawnTextureInfo() : fTexture(nullptr), fFormat(), fLevelCount(0) {
-    }
-    GrDawnTextureInfo(const GrDawnTextureInfo& other)
-        : fTexture(other.fTexture)
-        , fFormat(other.fFormat)
-        , fLevelCount(other.fLevelCount) {
-    }
-    GrDawnTextureInfo& operator=(const GrDawnTextureInfo& other) {
-        fTexture = other.fTexture;
-        fFormat = other.fFormat;
-        fLevelCount = other.fLevelCount;
-        return *this;
-    }
-    bool operator==(const GrDawnTextureInfo& other) const {
-        return fTexture.Get() == other.fTexture.Get() &&
-               fFormat == other.fFormat &&
-               fLevelCount == other.fLevelCount;
-    }
-};
-
-// GrDawnRenderTargetInfo holds a reference to a (1-mip) TextureView. This means that, for now,
-// GrDawnRenderTarget is suitable for rendering, but not readPixels() or writePixels(). Also,
-// backdrop filters and certain blend modes requiring copying the destination framebuffer
-// will not work.
-struct GrDawnRenderTargetInfo {
-    wgpu::TextureView   fTextureView;
-    wgpu::TextureFormat fFormat;
-    uint32_t            fLevelCount;
-    GrDawnRenderTargetInfo() : fTextureView(nullptr), fFormat(), fLevelCount(0) {
-    }
-    GrDawnRenderTargetInfo(const GrDawnRenderTargetInfo& other)
-        : fTextureView(other.fTextureView)
-        , fFormat(other.fFormat)
-        , fLevelCount(other.fLevelCount) {
-    }
-    explicit GrDawnRenderTargetInfo(const GrDawnTextureInfo& texInfo)
-        : fFormat(texInfo.fFormat)
-        , fLevelCount(1) {
-        wgpu::TextureViewDescriptor desc;
-        desc.format = texInfo.fFormat;
-        desc.mipLevelCount = 1;
-        fTextureView = texInfo.fTexture.CreateView(&desc);
-    }
-    GrDawnRenderTargetInfo& operator=(const GrDawnRenderTargetInfo& other) {
-        fTextureView = other.fTextureView;
-        fFormat = other.fFormat;
-        fLevelCount = other.fLevelCount;
-        return *this;
-    }
-    bool operator==(const GrDawnRenderTargetInfo& other) const {
-        return fTextureView.Get() == other.fTextureView.Get() &&
-               fFormat == other.fFormat &&
-               fLevelCount == other.fLevelCount;
-    }
-};
-
-struct GrDawnSurfaceInfo {
-    uint32_t fSampleCount = 1;
-    uint32_t fLevelCount = 0;
-    skgpu::Protected fProtected = skgpu::Protected::kNo;
-
-    wgpu::TextureFormat fFormat;
-};
-
-#endif

package/cpp/skia/include/private/SkBitmaskEnum.h

@@ -1,59 +0,0 @@
-/*
- * Copyright 2016 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-#ifndef SkEnumOperators_DEFINED
-#define SkEnumOperators_DEFINED
-
-#include <type_traits>
-
-namespace sknonstd {
-template <typename T> struct is_bitmask_enum : std::false_type {};
-
-template <typename E>
-std::enable_if_t<sknonstd::is_bitmask_enum<E>::value, bool> constexpr Any(E e) {
-    return static_cast<std::underlying_type_t<E>>(e) != 0;
-}
-}  // namespace sknonstd
-
-template <typename E>
-std::enable_if_t<sknonstd::is_bitmask_enum<E>::value, E> constexpr operator|(E l, E r) {
-    using U = std::underlying_type_t<E>;
-    return static_cast<E>(static_cast<U>(l) | static_cast<U>(r));
-}
-
-template <typename E>
-std::enable_if_t<sknonstd::is_bitmask_enum<E>::value, E&> constexpr operator|=(E& l, E r) {
-    return l = l | r;
-}
-
-template <typename E>
-std::enable_if_t<sknonstd::is_bitmask_enum<E>::value, E> constexpr operator&(E l, E r) {
-    using U = std::underlying_type_t<E>;
-    return static_cast<E>(static_cast<U>(l) & static_cast<U>(r));
-}
-
-template <typename E>
-std::enable_if_t<sknonstd::is_bitmask_enum<E>::value, E&> constexpr operator&=(E& l, E r) {
-    return l = l & r;
-}
-
-template <typename E>
-std::enable_if_t<sknonstd::is_bitmask_enum<E>::value, E> constexpr operator^(E l, E r) {
-    using U = std::underlying_type_t<E>;
-    return static_cast<E>(static_cast<U>(l) ^ static_cast<U>(r));
-}
-
-template <typename E>
-std::enable_if_t<sknonstd::is_bitmask_enum<E>::value, E&> constexpr operator^=(E& l, E r) {
-    return l = l ^ r;
-}
-
-template <typename E>
-std::enable_if_t<sknonstd::is_bitmask_enum<E>::value, E> constexpr operator~(E e) {
-    return static_cast<E>(~static_cast<std::underlying_type_t<E>>(e));
-}
-
-#endif  // SkEnumOperators_DEFINED

package/cpp/skia/include/private/SkSLDefines.h

@@ -1,64 +0,0 @@
-/*
- * Copyright 2019 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef SKSL_DEFINES
-#define SKSL_DEFINES
-
-#include <cstdint>
-
-#include "include/core/SkTypes.h"
-#include "include/private/base/SkTArray.h"
-
-using SKSL_INT = int64_t;
-using SKSL_FLOAT = float;
-
-namespace SkSL {
-
-class Expression;
-class Statement;
-
-using ComponentArray = skia_private::STArray<4, int8_t>; // for Swizzles
-
-class ExpressionArray : public skia_private::STArray<2, std::unique_ptr<Expression>> {
-public:
-    using STArray::STArray;
-
-    /** Returns a new ExpressionArray containing a clone of every element. */
-    ExpressionArray clone() const;
-};
-
-using StatementArray = skia_private::STArray<2, std::unique_ptr<Statement>>;
-
-// Functions larger than this (measured in IR nodes) will not be inlined. This growth factor
-// accounts for the number of calls being inlined--i.e., a function called five times (that is, with
-// five inlining opportunities) would be considered 5x larger than if it were called once. This
-// default threshold value is arbitrary, but tends to work well in practice.
-static constexpr int kDefaultInlineThreshold = 50;
-
-// A hard upper limit on the number of variable slots allowed in a function/global scope.
-// This is an arbitrary limit, but is needed to prevent code generation from taking unbounded
-// amounts of time or space.
-static constexpr int kVariableSlotLimit = 100000;
-
-// The SwizzleComponent namespace is used both by the SkSL::Swizzle expression, and the DSL swizzle.
-// This namespace is injected into SkSL::dsl so that `using namespace SkSL::dsl` enables DSL code
-// like `Swizzle(var, X, Y, ONE)` to compile without any extra qualifications.
-namespace SwizzleComponent {
-
-enum Type : int8_t {
-    X  =  0,  Y =  1,  Z =  2,  W =  3,
-    R  =  4,  G =  5,  B =  6,  A =  7,
-    S  =  8,  T =  9,  P = 10,  Q = 11,
-    UL = 12, UT = 13, UR = 14, UB = 15,
-    ZERO,
-    ONE
-};
-
-}  // namespace SwizzleComponent
-}  // namespace SkSL
-
-#endif

package/cpp/skia/include/private/SkShadowFlags.h

@@ -1,27 +0,0 @@
-/*
- * Copyright 2017 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef SkShadowFlags_DEFINED
-#define SkShadowFlags_DEFINED
-
-// A set of flags shared between the SkAmbientShadowMaskFilter and the SkSpotShadowMaskFilter
-enum SkShadowFlags {
-    kNone_ShadowFlag = 0x00,
-    /** The occluding object is not opaque. Knowing that the occluder is opaque allows
-    * us to cull shadow geometry behind it and improve performance. */
-    kTransparentOccluder_ShadowFlag = 0x01,
-    /** Don't try to use analytic shadows. */
-    kGeometricOnly_ShadowFlag = 0x02,
-    /** Light position represents a direction, light radius is blur radius at elevation 1 */
-    kDirectionalLight_ShadowFlag = 0x04,
-    /** Concave paths will only use blur to generate the shadow */
-    kConcaveBlurOnly_ShadowFlag = 0x08,
-    /** mask for all shadow flags */
-    kAll_ShadowFlag = 0x0F
-};
-
-#endif