Quellcode durchsuchen

Merge branch 'mpetroff:master' into add-available-standalone-iframe-features

pull/1122/head
Shawn Scofield vor 2 Jahren
committed by GitHub
Ursprung
Commit
f7213c9433
Es konnte kein GPG-Schlüssel zu dieser Signatur gefunden werden GPG-Schlüssel-ID: 4AEE18F83AFDEB23
2 geänderte Dateien mit 5 neuen und 2 gelöschten Zeilen
  1. +1
    -0
      src/js/pannellum.js
  2. +4
    -2
      utils/multires/generate.py

+ 1
- 0
src/js/pannellum.js Datei anzeigen

@@ -1856,6 +1856,7 @@ function createHotSpot(hs) {
hs.yaw = Number(hs.yaw) || 0; hs.yaw = Number(hs.yaw) || 0;


var div = document.createElement('div'); var div = document.createElement('div');
div.tabIndex = -1;
div.className = 'pnlm-hotspot-base'; div.className = 'pnlm-hotspot-base';
if (hs.cssClass) if (hs.cssClass)
div.className += ' ' + hs.cssClass; div.className += ' ' + hs.cssClass;


+ 4
- 2
utils/multires/generate.py Datei anzeigen

@@ -51,6 +51,8 @@ except KeyError:
# Handle case of PATH not being set # Handle case of PATH not being set
nona = None nona = None


# Handle Pillow deprecation
ANTIALIAS = Image.Resampling.LANCZOS if hasattr(Image, "Resampling") else Image.ANTIALIAS


genPreview = False genPreview = False
try: try:
@@ -251,7 +253,7 @@ for f in range(0, 6):
os.makedirs(os.path.join(args.output, str(level))) os.makedirs(os.path.join(args.output, str(level)))
tiles = int(math.ceil(float(size) / tileSize)) tiles = int(math.ceil(float(size) / tileSize))
if (level < levels): if (level < levels):
face = face.resize([size, size], Image.ANTIALIAS)
face = face.resize([size, size], ANTIALIAS)
for i in range(0, tiles): for i in range(0, tiles):
for j in range(0, tiles): for j in range(0, tiles):
left = j * tileSize left = j * tileSize
@@ -284,7 +286,7 @@ if args.fallbackSize > 0:
background = Image.new(face.mode[:-1], face.size, colorTuple) background = Image.new(face.mode[:-1], face.size, colorTuple)
background.paste(face, face.split()[-1]) background.paste(face, face.split()[-1])
face = background face = background
face = face.resize([args.fallbackSize, args.fallbackSize], Image.ANTIALIAS)
face = face.resize([args.fallbackSize, args.fallbackSize], ANTIALIAS)
face.save(os.path.join(args.output, 'fallback', faceLetters[f] + extension), quality = args.quality) face.save(os.path.join(args.output, 'fallback', faceLetters[f] + extension), quality = args.quality)


# Clean up temporary files # Clean up temporary files


Laden…
Abbrechen
Speichern