Created a object stream to use, and refactored writing objects to stream

Author: ff-gerard

.editorconfig

@@ -13,7 +13,8 @@ charset = utf-8
 end_of_line = crlf
 indent_style = space
 indent_size = 4
-insert_final_newline = false
+tab_width = 4
+insert_final_newline = true
 trim_trailing_whitespace = true
 
 #########################
@@ -43,7 +44,6 @@ trim_trailing_whitespace = false
 # Web Files
 [*.{htm,html,js,ts,tsx,css,sass,scss,less,svg,vue}]
 indent_size = 2
-insert_final_newline = true
 
 ###########################
 # C# code style settings
@@ -72,6 +72,9 @@ csharp_style_expression_bodied_local_functions = false:silent
 # https://docs.microsoft.com/en-us/visualstudio/ide/editorconfig-language-conventions?view=vs-2019#pattern-matching
 csharp_style_pattern_matching_over_is_with_cast_check = true:warning
 csharp_style_pattern_matching_over_as_with_null_check = true:warning
+csharp_style_prefer_pattern_matching = true:silent
+csharp_style_prefer_not_pattern = true:suggestion
+csharp_style_prefer_extended_property_pattern = true:suggestion
 
 # Inlined variable declarations
 # https://docs.microsoft.com/en-us/visualstudio/ide/editorconfig-language-conventions?view=vs-2019#inlined-variable-declarations
@@ -104,6 +107,20 @@ csharp_style_prefer_range_operator = true:suggestion
 # https://docs.microsoft.com/en-us/visualstudio/ide/editorconfig-language-conventions?view=vs-2019#miscellaneous-preferences
 csharp_style_deconstructed_variable_declaration = true:warning
 csharp_style_pattern_local_over_anonymous_function = true:none
+csharp_prefer_simple_using_statement = false:suggestion
+csharp_prefer_static_local_function = true:suggestion
+csharp_using_directive_placement = outside_namespace:silent
+csharp_style_namespace_declarations = file_scoped:suggestion
+csharp_style_prefer_method_group_conversion = true:silent
+csharp_style_prefer_null_check_over_type_check = true:suggestion
+csharp_style_prefer_local_over_anonymous_function = true:suggestion
+csharp_style_implicit_object_creation_when_type_is_apparent = false:suggestion
+csharp_style_prefer_tuple_swap = true:suggestion
+csharp_style_allow_embedded_statements_on_same_line_experimental = true:silent
+csharp_style_allow_blank_lines_between_consecutive_braces_experimental = true:silent
+csharp_style_allow_blank_line_after_colon_in_constructor_initializer_experimental = true:silent
+csharp_style_prefer_parameter_null_checking = true:suggestion
+csharp_style_prefer_switch_expression = true:suggestion
 
 ###########################
 # .NET code style settings
@@ -147,15 +164,23 @@ dotnet_style_prefer_inferred_tuple_names = true:warning
 dotnet_style_prefer_inferred_anonymous_type_member_names = false:suggestion
 dotnet_style_prefer_auto_properties = true:warning
 dotnet_style_prefer_is_null_check_over_reference_equality_method = true:warning
-dotnet_style_prefer_conditional_expression_over_assignment = true:suggestion
-dotnet_style_prefer_conditional_expression_over_return = true:suggestion
+dotnet_style_prefer_conditional_expression_over_assignment = true:silent
+dotnet_style_prefer_conditional_expression_over_return = true:silent
 dotnet_style_prefer_compound_assignment = true:suggestion
 
 # Null-checking preferences
 # https://docs.microsoft.com/en-us/visualstudio/ide/editorconfig-language-conventions?view=vs-2019#null-checking-preferences
 dotnet_style_coalesce_expression = true:warning
 dotnet_style_null_propagation = true:warning
 
+# Miscellaneous preferences
+dotnet_style_operator_placement_when_wrapping = beginning_of_line
+dotnet_style_prefer_simplified_boolean_expressions = true:suggestion
+dotnet_style_prefer_simplified_interpolation = true:suggestion
+dotnet_style_namespace_match_folder = true:suggestion
+dotnet_style_allow_multiple_blank_lines_experimental = true:suggestion
+dotnet_style_allow_statement_immediately_after_block_experimental = true:silent
+
 #############################
 # .NET code quality settings
 # https://docs.microsoft.com/en-us/visualstudio/ide/editorconfig-language-conventions?view=vs-2019#net-code-quality-settings
@@ -249,8 +274,13 @@ dotnet_naming_symbols.private_static_readonly_fields.applicable_accessibilities
 dotnet_naming_symbols.private_static_readonly_fields.applicable_kinds = field
 dotnet_naming_symbols.private_static_readonly_fields.required_modifiers = static, readonly
 
+# public_static_readonly_fields - Define static and readonly fields
+dotnet_naming_symbols.public_static_readonly_fields.applicable_accessibilities = public
+dotnet_naming_symbols.public_static_readonly_fields.applicable_kinds = field
+dotnet_naming_symbols.public_static_readonly_fields.required_modifiers = static, readonly
+
 # non_private_static_readonly_fields - Define static and readonly fields
-dotnet_naming_symbols.non_private_static_readonly_fields.applicable_accessibilities = public, internal, protected
+dotnet_naming_symbols.non_private_static_readonly_fields.applicable_accessibilities = internal, protected
 dotnet_naming_symbols.non_private_static_readonly_fields.applicable_kinds = field
 dotnet_naming_symbols.non_private_static_readonly_fields.required_modifiers = static, readonly
 
@@ -317,7 +347,12 @@ dotnet_naming_rule.non_private_static_readonly_fields_must_be_pascal_case.severi
 dotnet_naming_rule.non_private_static_readonly_fields_must_be_pascal_case.symbols = non_private_static_readonly_fields
 dotnet_naming_rule.non_private_static_readonly_fields_must_be_pascal_case.style = pascal_case
 
-# Public, internal and protected readonly fields must be PascalCase
+# Public static readonly fields must be ALL_UPPER_CASE
+dotnet_naming_rule.public_static_readonly_fields_must_be_all_upper.severity = warning
+dotnet_naming_rule.public_static_readonly_fields_must_be_all_upper.symbols = public_static_readonly_fields
+dotnet_naming_rule.public_static_readonly_fields_must_be_all_upper.style = all_upper_with_underscore
+
+# Internal and protected readonly fields must be PascalCase
 dotnet_naming_rule.non_private_readonly_fields_must_be_pascal_case.severity = warning
 dotnet_naming_rule.non_private_readonly_fields_must_be_pascal_case.symbols = non_private_readonly_fields
 dotnet_naming_rule.non_private_readonly_fields_must_be_pascal_case.style = pascal_case
@@ -365,4 +400,4 @@ dotnet_naming_rule.non_interface_types_must_be_pascal_case.style = pascal_case
 # Interfaces must be PascalCase and start with an 'I'
 dotnet_naming_rule.interface_types_must_be_prefixed_with_i.severity = warning
 dotnet_naming_rule.interface_types_must_be_prefixed_with_i.symbols = interface_types
-dotnet_naming_rule.interface_types_must_be_prefixed_with_i.style = prefix_interface_interface_with_i
+dotnet_naming_rule.interface_types_must_be_prefixed_with_i.style = prefix_interface_interface_with_i

src/Synercoding.FileFormats.Pdf/DocumentInformation.cs

@@ -1,5 +1,4 @@
 using Synercoding.FileFormats.Pdf.LowLevel;
-using Synercoding.FileFormats.Pdf.LowLevel.Extensions;
 using System;
 using System.Collections.Generic;
 
@@ -10,8 +9,6 @@ namespace Synercoding.FileFormats.Pdf
     /// </summary>
     public class DocumentInformation : IPdfObject
     {
-        private bool _isWritten;
-
         internal DocumentInformation(PdfReference id)
         {
             Reference = id;
@@ -64,88 +61,5 @@ internal DocumentInformation(PdfReference id)
         /// Extra information that will be added to the PDF meta data
         /// </summary>
         public IDictionary<string, string> ExtraInfo { get; } = new Dictionary<string, string>();
-
-        internal uint WriteToStream(PdfStream stream)
-        {
-            if (_isWritten)
-                throw new InvalidOperationException("Object is already written to stream.");
-
-            var position = (uint)stream.Position;
-
-            stream.IndirectDictionary(this, static (did, dictionary) =>
-            {
-                if (!string.IsNullOrWhiteSpace(did.Title))
-                    dictionary.Write(PdfName.Get("Title"), _toPdfHexadecimalString(did.Title!));
-                if (!string.IsNullOrWhiteSpace(did.Author))
-                    dictionary.Write(PdfName.Get("Author"), _toPdfHexadecimalString(did.Author!));
-                if (!string.IsNullOrWhiteSpace(did.Subject))
-                    dictionary.Write(PdfName.Get("Subject"), _toPdfHexadecimalString(did.Subject!));
-                if (!string.IsNullOrWhiteSpace(did.Keywords))
-                    dictionary.Write(PdfName.Get("Keywords"), _toPdfHexadecimalString(did.Keywords!));
-                if (!string.IsNullOrWhiteSpace(did.Creator))
-                    dictionary.Write(PdfName.Get("Creator"), _toPdfHexadecimalString(did.Creator!));
-                if (!string.IsNullOrWhiteSpace(did.Producer))
-                    dictionary.Write(PdfName.Get("Producer"), _toPdfHexadecimalString(did.Producer!));
-                if (did.CreationDate != null)
-                    dictionary.Write(PdfName.Get("CreationDate"), _toPdfDate(did.CreationDate.Value));
-                if (did.ModDate != null)
-                    dictionary.Write(PdfName.Get("ModDate"), _toPdfDate(did.ModDate.Value));
-
-                if(did.ExtraInfo.Count != 0)
-                    foreach(var kv in did.ExtraInfo)
-                        dictionary.Write(PdfName.Get(kv.Key), _toPdfHexadecimalString(kv.Value));
-            });
-
-            _isWritten = true;
-
-            return position;
-        }
-        
-        private static string _toPdfHexadecimalString(string input)
-        {
-            var bytes = System.Text.Encoding.ASCII.GetBytes(input);
-            var builder = new System.Text.StringBuilder((bytes.Length * 2) + 2);
-            builder.Append('<');
-            foreach (var b in bytes)
-            {
-                builder.Append(b.ToString("X2"));
-            }
-            builder.Append('>');
-            return builder.ToString();
-        }
-
-        private static string _toPdfDate(DateTimeOffset input)
-        {
-            var datePart = input.ToString("yyyyMMddHHmmss");
-
-            var builder = new System.Text.StringBuilder(22);
-            builder.Append("(D:");
-            builder.Append(datePart);
-
-            var hours = input.Offset.Hours;
-            var minutes = input.Offset.Minutes;
-
-            if (hours == 0 && minutes == 0)
-            {
-                builder.Append("Z00'00");
-            }
-            else
-            {
-                if (hours > 0 || (hours == 0 && minutes > 0))
-                {
-                    builder.Append('+');
-                }
-                else
-                {
-                    builder.Append('-');
-                }
-                builder.Append(Math.Abs(hours).ToString().PadLeft(2, '0'));
-                builder.Append('\'');
-                builder.Append(minutes.ToString().PadLeft(2, '0'));
-            }
-            builder.Append(')');
-
-            return builder.ToString();
-        }
     }
 }

src/Synercoding.FileFormats.Pdf/Extensions/PdfPageExtensions.cs

@@ -1,6 +1,7 @@
-using Synercoding.FileFormats.Pdf.Internals;
+using Synercoding.FileFormats.Pdf.LowLevel.Extensions;
 using Synercoding.FileFormats.Pdf.LowLevel.Graphics;
 using Synercoding.FileFormats.Pdf.LowLevel.Graphics.Colors;
+using Synercoding.FileFormats.Pdf.LowLevel.Internal;
 using Synercoding.FileFormats.Pdf.LowLevel.Operators.State;
 using Synercoding.FileFormats.Pdf.LowLevel.Text;
 using Synercoding.Primitives;

src/Synercoding.FileFormats.Pdf/Image.cs

@@ -11,9 +11,7 @@ namespace Synercoding.FileFormats.Pdf
     /// </summary>
     public sealed class Image : IPdfObject, IDisposable
     {
-        private readonly Stream _imageStream;
         private bool _disposed;
-        private bool _isWritten;
 
         internal Image(PdfReference id, SixLabors.ImageSharp.Image image)
         {
@@ -28,7 +26,7 @@ internal Image(PdfReference id, SixLabors.ImageSharp.Image image)
             Width = image.Width;
             Height = image.Height;
             ms.Position = 0;
-            _imageStream = ms;
+            RawStream = ms;
         }
 
         internal Image(PdfReference id, Stream jpgStream, int width, int height)
@@ -37,9 +35,11 @@ internal Image(PdfReference id, Stream jpgStream, int width, int height)
 
             Width = width;
             Height = height;
-            _imageStream = jpgStream;
+            RawStream = jpgStream;
         }
 
+        internal Stream RawStream { get; private set; }
+
         /// <inheritdoc />
         public PdfReference Reference { get; private set; }
 
@@ -58,38 +58,9 @@ public void Dispose()
         {
             if (!_disposed)
             {
-                _imageStream.Dispose();
+                RawStream.Dispose();
                 _disposed = true;
             }
         }
-
-        internal bool TryWriteToStream(PdfStream stream, out uint position)
-        {
-            position = 0;
-
-            if (_isWritten)
-                return false;
-            if (_disposed)
-                throw new ObjectDisposedException(nameof(_imageStream), "Internal image is already disposed");
-
-            position = (uint)stream.Position;
-
-            stream.IndirectStream(this, _imageStream, this, static (image, dictionary) =>
-            {
-                dictionary
-                    .Type(ObjectType.XObject)
-                    .SubType(XObjectSubType.Image)
-                    .Write(PdfName.Get("Width"), image.Width)
-                    .Write(PdfName.Get("Height"), image.Height)
-                    .Write(PdfName.Get("ColorSpace"), PdfName.Get("DeviceRGB"))
-                    .Write(PdfName.Get("BitsPerComponent"), 8)
-                    .Write(PdfName.Get("Decode"), 0f, 1f, 0f, 1f, 0f, 1f);
-            },
-            StreamFilter.DCTDecode);
-
-            _isWritten = true;
-
-            return true;
-        }
     }
 }