From 862b0485e088170070df8b5ffd3e0e3123166798 Mon Sep 17 00:00:00 2001 From: Taner Sener Date: Sun, 21 Aug 2022 23:40:34 +0100 Subject: [PATCH] fix indentation errors in fonts.conf file created on apple and android platforms --- .../arthenica/ffmpegkit/FFmpegKitConfig.java | 18 ++++++++--------- apple/src/FFmpegKitConfig.m | 20 +++++++++---------- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/android/ffmpeg-kit-android-lib/src/main/java/com/arthenica/ffmpegkit/FFmpegKitConfig.java b/android/ffmpeg-kit-android-lib/src/main/java/com/arthenica/ffmpegkit/FFmpegKitConfig.java index 1f58a8e..c1e99fd 100644 --- a/android/ffmpeg-kit-android-lib/src/main/java/com/arthenica/ffmpegkit/FFmpegKitConfig.java +++ b/android/ffmpeg-kit-android-lib/src/main/java/com/arthenica/ffmpegkit/FFmpegKitConfig.java @@ -430,14 +430,14 @@ public class FFmpegKitConfig { String mappedFontName = mapping.getValue(); if ((fontName != null) && (mappedFontName != null) && (fontName.trim().length() > 0) && (mappedFontName.trim().length() > 0)) { - fontNameMappingBlock.append(" \n"); - fontNameMappingBlock.append(" \n"); - fontNameMappingBlock.append(String.format(" %s\n", fontName)); - fontNameMappingBlock.append(" \n"); - fontNameMappingBlock.append(" \n"); - fontNameMappingBlock.append(String.format(" %s\n", mappedFontName)); - fontNameMappingBlock.append(" \n"); - fontNameMappingBlock.append(" \n"); + fontNameMappingBlock.append(" \n"); + fontNameMappingBlock.append(" \n"); + fontNameMappingBlock.append(String.format(" %s\n", fontName)); + fontNameMappingBlock.append(" \n"); + fontNameMappingBlock.append(" \n"); + fontNameMappingBlock.append(String.format(" %s\n", mappedFontName)); + fontNameMappingBlock.append(" \n"); + fontNameMappingBlock.append(" \n"); validFontNameMappingCount++; } @@ -455,7 +455,7 @@ public class FFmpegKitConfig { fontConfigBuilder.append("\n"); } fontConfigBuilder.append(fontNameMappingBlock); - fontConfigBuilder.append(""); + fontConfigBuilder.append("\n"); final AtomicReference reference = new AtomicReference<>(); try { diff --git a/apple/src/FFmpegKitConfig.m b/apple/src/FFmpegKitConfig.m index a9f4296..db08744 100644 --- a/apple/src/FFmpegKitConfig.m +++ b/apple/src/FFmpegKitConfig.m @@ -840,14 +840,14 @@ int executeFFprobe(long sessionId, NSArray* arguments) { if ((fontName != nil) && (mappedFontName != nil) && ([fontName length] > 0) && ([mappedFontName length] > 0)) { fontNameMappingBlock = [NSString stringWithFormat:@"%@\n%@\n%@%@%@\n%@\n%@\n%@%@%@\n%@\n%@\n", - @" ", - @" ", - @" ", fontName, @"", - @" ", - @" ", - @" ", mappedFontName, @"", - @" ", - @" "]; + @" ", + @" ", + @" ", fontName, @"", + @" ", + @" ", + @" ", mappedFontName, @"", + @" ", + @" "]; validFontNameMappingCount++; } @@ -862,10 +862,10 @@ int executeFFprobe(long sessionId, NSArray* arguments) { NSString *fontDirectoryPath = [fontDirectoryArray objectAtIndex:i]; [fontConfiguration appendString: @" "]; [fontConfiguration appendString: fontDirectoryPath]; - [fontConfiguration appendString: @""]; + [fontConfiguration appendString: @"\n"]; } [fontConfiguration appendString:fontNameMappingBlock]; - [fontConfiguration appendString:@""]; + [fontConfiguration appendString:@"\n"]; if (![fontConfiguration writeToFile:fontConfigurationFile atomically:YES encoding:NSUTF8StringEncoding error:&error]) { NSLog(@"Failed to set font directory. Error received while saving font configuration: %@.", error);